BrahmaOS · koala-xulu · Aug 8, 2018 · Aug 8, 2018 · Aug 8, 2018 · Aug 8, 2018
diff --git a/Nexus6P/build/make/0006-add-classes-of-ipfs-jars-to-package_whitelist.txt.patch b/Nexus6P/build/make/0006-add-classes-of-ipfs-jars-to-package_whitelist.txt.patch
@@ -0,0 +1,39 @@
+From 66055ca0d9c5e138b38644e7b810bab96ff711d0 Mon Sep 17 00:00:00 2001
+From: koala <koalo@brahmaos.io>
+Date: Wed, 25 Jul 2018 17:44:57 +0800
+Subject: [PATCH 6/6] add classes of ipfs jars to package_whitelist.txt
+
+Change-Id: I9b6fc257a4ae623d8563a4cb431fd918a1b71ac4
+Signed-off-by: koala <koalo@brahmaos.io>
+---
+ core/tasks/check_boot_jars/package_whitelist.txt | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/core/tasks/check_boot_jars/package_whitelist.txt b/core/tasks/check_boot_jars/package_whitelist.txt
+index 15b9990..597e236 100644
+--- a/core/tasks/check_boot_jars/package_whitelist.txt
++++ b/core/tasks/check_boot_jars/package_whitelist.txt
+@@ -124,6 +124,20 @@ com\.android\..*
+ # legacy-test.jar
+ junit\.extensions
+ junit\.framework
++junit\.textui
++junit\.runner
++org\.junit
++org\.junit\.runners
++org\.junit\.runners\.model
++org\.junit\..*
++org\.hamcrest
++org\.hamcrest\..*
++io\.ipfs\.api
++io\.ipfs\.api\..*
++io\.ipfs\.multihash
++io\.ipfs\.multibase
++io\.ipfs\.multiaddr
++io\.ipfs\.cid
+ android\.test
+ android\.test\.suitebuilder\.annotation
+
+-- 
+2.7.4
+
diff --git a/Nexus6P/frameworks/base/0005-modify-ipfs-server-aidl-file-to-framework.patch b/Nexus6P/frameworks/base/0005-modify-ipfs-server-aidl-file-to-framework.patch
@@ -0,0 +1,100 @@
+From e1500198d1288a959442e152aa6bd2d293ee09aa Mon Sep 17 00:00:00 2001
+From: koala <koalo@brahmaos.io>
+Date: Tue, 10 Jul 2018 11:54:12 +0800
+Subject: [PATCH 5/8] modify ipfs server aidl file to framework
+
+-produce by make update-api
+
+Change-Id: Ie1d7385a5d8d454a5eb42e103ec837ce1e163fc0
+Signed-off-by: koala <koalo@brahmaos.io>
+---
+ api/current.txt        | 12 ------------
+ api/system-current.txt | 18 ------------------
+ api/test-current.txt   | 12 ------------
+ 3 files changed, 42 deletions(-)
+
+diff --git a/api/current.txt b/api/current.txt
+index 10f2354..7d0586a 100644
+--- a/api/current.txt
++++ b/api/current.txt
+@@ -31064,18 +31064,6 @@ package android.os {
+     method public abstract android.os.IBinder asBinder();
+   }
+
+-  public abstract interface ISelfManager implements android.os.IInterface {
+-    method public abstract int selfAddNumber(int, int) throws android.os.RemoteException;
+-    method public abstract java.lang.String selfAddString(java.lang.String) throws android.os.RemoteException;
+-  }
+-
+-  public static abstract class ISelfManager.Stub extends android.os.Binder implements android.os.ISelfManager {
+-    ctor public ISelfManager.Stub();
+-    method public android.os.IBinder asBinder();
+-    method public static android.os.ISelfManager asInterface(android.os.IBinder);
+-    method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;
+-  }
+-
+   public final class LocaleList implements android.os.Parcelable {
+     ctor public LocaleList(java.util.Locale...);
+     method public int describeContents();
+diff --git a/api/system-current.txt b/api/system-current.txt
+index 4b88c7a..8ec1cd6 100644
+--- a/api/system-current.txt
++++ b/api/system-current.txt
+@@ -5046,12 +5046,6 @@ package android.app {
+     field public static final int TRANSIT_UNSET = -1; // 0xffffffff
+   }
+
+-  public class IPFSCManager {
+-    ctor public IPFSCManager(android.content.Context, android.os.IIPFSControllerManager);
+-    method public int start_IPFSController(int) throws android.os.RemoteException;
+-    method public int stop_IPFSController(int) throws android.os.RemoteException;
+-  }
+-
+   public abstract class InstantAppResolverService extends android.app.Service {
+     ctor public InstantAppResolverService();
+     method public final void attachBaseContext(android.content.Context);
+@@ -33790,18 +33784,6 @@ package android.os {
+     method public abstract android.os.IBinder asBinder();
+   }
+
+-  public abstract interface ISelfManager implements android.os.IInterface {
+-    method public abstract int selfAddNumber(int, int) throws android.os.RemoteException;
+-    method public abstract java.lang.String selfAddString(java.lang.String) throws android.os.RemoteException;
+-  }
+-
+-  public static abstract class ISelfManager.Stub extends android.os.Binder implements android.os.ISelfManager {
+-    ctor public ISelfManager.Stub();
+-    method public android.os.IBinder asBinder();
+-    method public static android.os.ISelfManager asInterface(android.os.IBinder);
+-    method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;
+-  }
+-
+   public class IncidentManager {
+     method public void reportIncident(android.os.IncidentReportArgs);
+     method public void reportIncident(java.lang.String, byte[]);
+diff --git a/api/test-current.txt b/api/test-current.txt
+index 22d9d72..9c72960 100644
+--- a/api/test-current.txt
++++ b/api/test-current.txt
+@@ -31220,18 +31220,6 @@ package android.os {
+     method public abstract android.os.IBinder asBinder();
+   }
+
+-  public abstract interface ISelfManager implements android.os.IInterface {
+-    method public abstract int selfAddNumber(int, int) throws android.os.RemoteException;
+-    method public abstract java.lang.String selfAddString(java.lang.String) throws android.os.RemoteException;
+-  }
+-
+-  public static abstract class ISelfManager.Stub extends android.os.Binder implements android.os.ISelfManager {
+-    ctor public ISelfManager.Stub();
+-    method public android.os.IBinder asBinder();
+-    method public static android.os.ISelfManager asInterface(android.os.IBinder);
+-    method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;
+-  }
+-
+   public class IncidentManager {
+     method public void reportIncident(android.os.IncidentReportArgs);
+     method public void reportIncident(java.lang.String, byte[]);
+-- 
+2.7.4
+
diff --git a/Nexus6P/frameworks/base/0006-modify-system-current.txt-produce-by-make-update-api.patch b/Nexus6P/frameworks/base/0006-modify-system-current.txt-produce-by-make-update-api.patch
@@ -0,0 +1,31 @@
+From 6528b9bb7fa5a90016e2682faa40bedb353bcb97 Mon Sep 17 00:00:00 2001
+From: koala <koalo@brahmaos.io>
+Date: Wed, 11 Jul 2018 17:45:05 +0800
+Subject: [PATCH 6/8] modify system-current.txt produce by make update-api
+
+Change-Id: I243c49a06966eff86d4266be609957d383215578
+Signed-off-by: koala <koalo@brahmaos.io>
+---
+ api/system-current.txt | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/api/system-current.txt b/api/system-current.txt
+index 8ec1cd6..9c2a12f 100644
+--- a/api/system-current.txt
++++ b/api/system-current.txt
+@@ -5046,6 +5046,12 @@ package android.app {
+     field public static final int TRANSIT_UNSET = -1; // 0xffffffff
+   }
+
++  public class IPFSCManager {
++    ctor public IPFSCManager(android.content.Context, android.os.IIPFSControllerManager);
++    method public int start_IPFSController(int) throws android.os.RemoteException;
++    method public int stop_IPFSController(int) throws android.os.RemoteException;
++  }
++
+   public abstract class InstantAppResolverService extends android.app.Service {
+     ctor public InstantAppResolverService();
+     method public final void attachBaseContext(android.content.Context);
+-- 
+2.7.4
+
diff --git a/Nexus6P/frameworks/base/0007-modify-the-ipfs-switch-in-setting.patch b/Nexus6P/frameworks/base/0007-modify-the-ipfs-switch-in-setting.patch
@@ -0,0 +1,202 @@
+From ea4e50a8ea657b1060a196b868ab814f1873ed2e Mon Sep 17 00:00:00 2001
+From: koala <koalo@brahmaos.io>
+Date: Wed, 1 Aug 2018 17:30:27 +0800
+Subject: [PATCH 7/8] modify  the ipfs switch in setting
+
+- fix the bug when restart the device,the ipfs status can be
+  saved by previou operation
+- add interface systemready in IPFSCManager server to decide whether to start IPFSserver
+- update current.txt system-current.txt test-current.txt
+
+Change-Id: I7da397cf95cb4ce15fbf20ad7f4a8f368a18a546
+Signed-off-by: koala <koalo@brahmaos.io>
+---
+ api/current.txt                                    |  1 +
+ api/system-current.txt                             |  1 +
+ api/test-current.txt                               |  1 +
+ core/java/android/app/IPFSCManager.java            |  3 +-
+ core/java/android/provider/Settings.java           |  5 +++-
+ .../com/android/server/IPFSCManagerService.java    | 35 ++++++++++++++++++++--
+ services/java/com/android/server/SystemServer.java | 16 ++++++++--
+ 7 files changed, 56 insertions(+), 6 deletions(-)
+
+diff --git a/api/current.txt b/api/current.txt
+index 7d0586a..78a7fc2 100644
+--- a/api/current.txt
++++ b/api/current.txt
+@@ -35132,6 +35132,7 @@ package android.provider {
+     field public static final java.lang.String HAPTIC_FEEDBACK_ENABLED = "haptic_feedback_enabled";
+     field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy";
+     field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
++    field public static final java.lang.String IPFSCONTLLER_STATUS = "IPFSCONTLLER_status";
+     field public static final deprecated java.lang.String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
+     field public static final deprecated java.lang.String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
+     field public static final deprecated java.lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
+diff --git a/api/system-current.txt b/api/system-current.txt
+index 9c2a12f..e69d0e3 100644
+--- a/api/system-current.txt
++++ b/api/system-current.txt
+@@ -38193,6 +38193,7 @@ package android.provider {
+     field public static final java.lang.String HAPTIC_FEEDBACK_ENABLED = "haptic_feedback_enabled";
+     field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy";
+     field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
++    field public static final java.lang.String IPFSCONTLLER_STATUS = "IPFSCONTLLER_status";
+     field public static final deprecated java.lang.String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
+     field public static final deprecated java.lang.String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
+     field public static final deprecated java.lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
+diff --git a/api/test-current.txt b/api/test-current.txt
+index 9c72960..2181bc1 100644
+--- a/api/test-current.txt
++++ b/api/test-current.txt
+@@ -35328,6 +35328,7 @@ package android.provider {
+     field public static final java.lang.String HAPTIC_FEEDBACK_ENABLED = "haptic_feedback_enabled";
+     field public static final deprecated java.lang.String HTTP_PROXY = "http_proxy";
+     field public static final deprecated java.lang.String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
++    field public static final java.lang.String IPFSCONTLLER_STATUS = "IPFSCONTLLER_status";
+     field public static final deprecated java.lang.String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
+     field public static final deprecated java.lang.String LOCK_PATTERN_ENABLED = "lock_pattern_autolock";
+     field public static final deprecated java.lang.String LOCK_PATTERN_TACTILE_FEEDBACK_ENABLED = "lock_pattern_tactile_feedback_enabled";
+diff --git a/core/java/android/app/IPFSCManager.java b/core/java/android/app/IPFSCManager.java
+index b1a11b5..2f642e3 100644
+--- a/core/java/android/app/IPFSCManager.java
++++ b/core/java/android/app/IPFSCManager.java
+@@ -12,7 +12,8 @@ public class IPFSCManager {
+     IIPFSControllerManager mIIPFSCManager;
+
+     public IPFSCManager(Context ctx,IIPFSControllerManager IPFSCManager) {
+-        mIIPFSCManager = IPFSCManager;
++        Log.d(TAG,"IPFSManger init");
++	mIIPFSCManager = IPFSCManager;
+     }
+
+     public int start_IPFSController(int numberFirst) throws RemoteException  {
+diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
+index ba62b47..65dbf23 100755
+--- a/core/java/android/provider/Settings.java
++++ b/core/java/android/provider/Settings.java
+@@ -3113,6 +3113,7 @@ public final class Settings {
+          * @deprecated This functionality is no longer available as of
+          * {@link android.os.Build.VERSION_CODES#N_MR1}.
+          */
++
+         @Deprecated
+         public static final String SHOW_PROCESSES = Global.SHOW_PROCESSES;
+
+@@ -3356,6 +3357,7 @@ public final class Settings {
+          */
+         public static final String NOTIFICATION_SOUND = "notification_sound";
+
++        public static final String IPFSCONTLLER_STATUS = "IPFSCONTLLER_status";
+         private static final Validator NOTIFICATION_SOUND_VALIDATOR = sUriValidator;
+
+         /**
+@@ -3991,7 +3993,8 @@ public final class Settings {
+             LOCK_TO_APP_ENABLED,
+             NOTIFICATION_SOUND,
+             ACCELEROMETER_ROTATION,
+-            SHOW_BATTERY_PERCENT
++            SHOW_BATTERY_PERCENT,
++            IPFSCONTLLER_STATUS
+         };
+
+         /**
+diff --git a/services/java/com/android/server/IPFSCManagerService.java b/services/java/com/android/server/IPFSCManagerService.java
+index e75db79..8f4204c 100644
+--- a/services/java/com/android/server/IPFSCManagerService.java
++++ b/services/java/com/android/server/IPFSCManagerService.java
+@@ -2,18 +2,49 @@ package com.android.server;
+ import android.util.Log;
+ import android.os.IIPFSControllerManager;
+ import android.ipfs.IPFSController;
++import android.content.Context;
++
++import android.provider.Settings;
++
++
++import static android.provider.Settings.System.IPFSCONTLLER_STATUS;
+
+
+ public class IPFSCManagerService extends IIPFSControllerManager.Stub {
+     private static final String TAG = "IPFS_LOG";
+ 	IPFSController IPFSControllerM;
++	private final String SYSTEM_KEY = IPFSCONTLLER_STATUS;
++	/*default is close*/
++	private final int DEFAULT_VALUE = 0;
++	private final int STOP_VALUE = 1;
++	private final int START_VALUE = 2;
++	private final Context mContext;
++	private final int mparameter = 0;
++
++	IPFSCManagerService(Context context)
++	{
++		Log.d(TAG,"IPFSCManagerService");
++		mContext = context;
++	}
++
++	public int systemReady()
++	{
++		int status = Settings.System.getInt(mContext.getContentResolver(),
++                SYSTEM_KEY, DEFAULT_VALUE);
++		if(status == START_VALUE)
++			IPFSController_start(mparameter);
++		Log.d(TAG,"systemready:%d"+status);
++		return 0;
++	}
+
+     public int IPFSController_start(int parameter) {
+-	IPFSControllerM.JStartIPFSController(parameter);
++        Log.d(TAG,"start_IPFSCManagerService");
++		IPFSControllerM.JStartIPFSController(parameter);
+         return 0;
+     }
+     public int IPFSController_stop(int parameter) {
+-	IPFSControllerM.JStopIPFSController(0);
++		Log.d(TAG,"stop_IPFSCManagerService");
++		IPFSControllerM.JStopIPFSController(0);
+         return 0;
+     }
+
+diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
+index 1a970cb..6d47c98 100644
+--- a/services/java/com/android/server/SystemServer.java
++++ b/services/java/com/android/server/SystemServer.java
+@@ -692,6 +692,7 @@ public final class SystemServer {
+         CommonTimeManagementService commonTimeMgmtService = null;
+         InputManagerService inputManager = null;
+         TelephonyRegistry telephonyRegistry = null;
++		IPFSCManagerService  mIPFSCManagerService = null;
+         ConsumerIrService consumerIr = null;
+         MmsServiceBroker mmsService = null;
+         HardwarePropertiesManagerService hardwarePropertiesService = null;
+@@ -753,8 +754,9 @@ public final class SystemServer {
+             traceEnd();
+
+             traceBeginAndSlog("IPFSControllerManagerService");
+-            ServiceManager.addService("IPFSControllerManagerService",new IPFSCManagerService());
+-	    traceEnd();
++			mIPFSCManagerService = new IPFSCManagerService(context);
++            ServiceManager.addService("IPFSControllerManagerService",mIPFSCManagerService);
++            traceEnd();
+
+             traceBeginAndSlog("StartKeyChainSystemService");
+             mSystemServiceManager.startService(KeyChainSystemService.class);
+@@ -1588,6 +1590,16 @@ public final class SystemServer {
+         }
+         traceEnd();
+
++        traceBeginAndSlog("MakeIPFSCMangerServiceReady");
++        if (mIPFSCManagerService != null) {
++            try {
++                mIPFSCManagerService.systemReady();
++            } catch (Throwable e) {
++                reportWtf("making IPFSCManger Service ready", e);
++            }
++        }
++        traceEnd();
++
+         // Needed by DevicePolicyManager for initialization
+         traceBeginAndSlog("StartBootPhaseLockSettingsReady");
+         mSystemServiceManager.startBootPhase(SystemService.PHASE_LOCK_SETTINGS_READY);
+-- 
+2.7.4
+