summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2011-04-04 14:42:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-04 14:42:44 -0700
commit7bb236c3b5e49f53b3110855276d99e664b29931 (patch)
tree02cead1a95a5e7c4292ce5e9ce044160ce70c0b9 /core
parentb0ccbacdb35e8e987eb9efd61af13fefd7c2f5f0 (diff)
parent84d340781b1e148ead9fb4790755737c9dcc1cde (diff)
downloadframeworks_base-7bb236c3b5e49f53b3110855276d99e664b29931.zip
frameworks_base-7bb236c3b5e49f53b3110855276d99e664b29931.tar.gz
frameworks_base-7bb236c3b5e49f53b3110855276d99e664b29931.tar.bz2
am 84d34078: Make the NFC UID forward compatible.
* commit '84d340781b1e148ead9fb4790755737c9dcc1cde': Make the NFC UID forward compatible.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/os/Process.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index 29ea727..e1fdfb6 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -89,7 +89,7 @@ public class Process {
* Defines the UID/GID for the NFC service process.
* @hide
*/
- public static final int NFC_UID = 1023;
+ public static final int NFC_UID = 1025;
/**
* Defines the start of a range of UIDs (and GIDs), going from this