diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-08-27 01:57:50 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-08-27 01:57:50 -0700 |
| commit | d1cd68eca1bbcfe523b365edc9808fe79cc20c90 (patch) | |
| tree | 6946720660c4772a5592eabf46bc672ce1138ad3 /AndroidManifest.xml | |
| parent | 5c9ec1753dfcb83b98c26354d92d05f4be4fd808 (diff) | |
| parent | 83cab5026087debc28bbe8b187655626c55e9103 (diff) | |
| download | android_external_ant-wireless_ant_service-cm-13.0.tar.gz android_external_ant-wireless_ant_service-cm-13.0.tar.bz2 android_external_ant-wireless_ant_service-cm-13.0.zip | |
Merge "Merge remote-tracking branch 'remotes/quic/caf/github/master' into tip"HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-12.1staging/cm-12.0-cafstable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Estable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-13.0cm-12.1cm-12.0
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index dd9cfc2..ebd1541 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,8 +16,8 @@ limitations under the License. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.dsi.ant.server" - android:versionName="3.1.1" - android:versionCode="030101" + android:versionName="4.0.0" + android:versionCode="030200" android:sharedUserId="android.uid.system"> <uses-sdk @@ -25,7 +25,7 @@ limitations under the License. android:targetSdkVersion="10" /> - <application android:icon="@drawable/icon" + <application android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:process="system" android:permission="com.dsi.ant.permission.ANTRADIO" > @@ -53,18 +53,6 @@ limitations under the License. </application> <!-- These permissions should be defined in the system --> - <permission android:name="com.dsi.ant.permission.ANT" - android:protectionLevel="dangerous" - android:permissionGroup="android.permission-group.NETWORK" - android:description="@string/permdesc_ant" - android:label="@string/permlab_ant"/> - - <permission android:name="com.dsi.ant.permission.ANT_ADMIN" - android:protectionLevel="dangerous" - android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:description="@string/permdesc_antAdmin" - android:label="@string/permlab_antAdmin"/> - <permission android:name="com.dsi.ant.permission.ANTRADIO" android:protectionLevel="dangerous" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" |