diff options
| author | Arthur Cassegrain <arthur.cassegrain@trustonic.com> | 2016-01-25 08:08:45 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2017-02-12 19:50:51 +0100 |
| commit | e6ededadb477a1d7829dbd861cf98c99986956a7 (patch) | |
| tree | 8670fd2fce1aea09db2a619b62bf36bf95e36a6c | |
| parent | 9f7e96a70478d3e607b8e10128d6e73356244ba1 (diff) | |
| download | android_hardware_samsung_slsi_exynos5430-e6ededadb477a1d7829dbd861cf98c99986956a7.tar.gz android_hardware_samsung_slsi_exynos5430-e6ededadb477a1d7829dbd861cf98c99986956a7.tar.xz android_hardware_samsung_slsi_exynos5430-e6ededadb477a1d7829dbd861cf98c99986956a7.zip | |
CM Updating rootpa to 3.94
Using patch delivered by Arnaud.
| -rwxr-xr-x[-rw-r--r--] | mobicore/rootpa/Code/Android/app/Android.mk | 1 | ||||
| -rw-r--r-- | mobicore/rootpa/Code/Android/app/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | mobicore/rootpa/Code/Android/app/res/values/version.xml | 4 | ||||
| -rw-r--r-- | mobicore/rootpa/Code/Android/app/src/com/gd/mobicore/pa/jni/CommonPAWrapper.java | 7 | ||||
| -rw-r--r-- | mobicore/rootpa/Code/Common/include/version.h | 2 |
5 files changed, 9 insertions, 13 deletions
diff --git a/mobicore/rootpa/Code/Android/app/Android.mk b/mobicore/rootpa/Code/Android/app/Android.mk index 850b070..a9c5aec 100644..100755 --- a/mobicore/rootpa/Code/Android/app/Android.mk +++ b/mobicore/rootpa/Code/Android/app/Android.mk @@ -22,4 +22,3 @@ LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) include $(CLEAR_VARS) - diff --git a/mobicore/rootpa/Code/Android/app/AndroidManifest.xml b/mobicore/rootpa/Code/Android/app/AndroidManifest.xml index 7ffb326..02cf95e 100644 --- a/mobicore/rootpa/Code/Android/app/AndroidManifest.xml +++ b/mobicore/rootpa/Code/Android/app/AndroidManifest.xml @@ -6,12 +6,12 @@ android:versionName="@string/name" > <uses-sdk android:minSdkVersion="14" - android:targetSdkVersion="17" /> + android:targetSdkVersion="23" /> <uses-permission android:name="android.permission.INTERNET"/> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - <uses-permission android:name="android.permission.READ_PHONE_STATE" /> - <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" + android:maxSdkVersion="22" /> <permission android:name="com.gd.mobicore.pa.permission.OEM_PERMISSION" android:label="remove installed secure services" diff --git a/mobicore/rootpa/Code/Android/app/res/values/version.xml b/mobicore/rootpa/Code/Android/app/res/values/version.xml index 2ec00e2..fdc081a 100644 --- a/mobicore/rootpa/Code/Android/app/res/values/version.xml +++ b/mobicore/rootpa/Code/Android/app/res/values/version.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="name">3.0079 (51551)</string> - <integer name="code">0x3004F</integer> +<string name="name">3.94</string> +<integer name="code">0x3005e</integer> </resources> diff --git a/mobicore/rootpa/Code/Android/app/src/com/gd/mobicore/pa/jni/CommonPAWrapper.java b/mobicore/rootpa/Code/Android/app/src/com/gd/mobicore/pa/jni/CommonPAWrapper.java index 87d546e..36abbe9 100644 --- a/mobicore/rootpa/Code/Android/app/src/com/gd/mobicore/pa/jni/CommonPAWrapper.java +++ b/mobicore/rootpa/Code/Android/app/src/com/gd/mobicore/pa/jni/CommonPAWrapper.java @@ -114,11 +114,8 @@ public class CommonPAWrapper { public String[] getSystemInfo(){ Log.d(TAG,">>CommonPAWrapper.getSystemInfo"); String[] response= new String[RESPONSE_ARRAY_SIZE]; - TelephonyManager telephonyManager = (TelephonyManager)service_.getSystemService(Context.TELEPHONY_SERVICE); - if(telephonyManager!=null){ - response[IMEI_ESN_INDEX]=telephonyManager.getDeviceId(); - response[MNO_INDEX]=telephonyManager.getSimOperatorName(); - } + response[IMEI_ESN_INDEX]=""; + response[MNO_INDEX]=""; response[BRAND_INDEX]=Build.BRAND; response[MANUFACTURER_INDEX]=Build.MANUFACTURER; response[HARDWARE_INDEX]=Build.HARDWARE; diff --git a/mobicore/rootpa/Code/Common/include/version.h b/mobicore/rootpa/Code/Common/include/version.h index bed8f80..b9491bb 100644 --- a/mobicore/rootpa/Code/Common/include/version.h +++ b/mobicore/rootpa/Code/Common/include/version.h @@ -35,6 +35,6 @@ #define ROOTPA_VERSION_H_ #define ROOTPA_VERSION_MAJOR 3 -#define ROOTPA_VERSION_MINOR 89 +#define ROOTPA_VERSION_MINOR 94 #endif /** ROOTPA_VERSION_H_ */ |