Merge "Service for reading and writing blocks to PST partition" (54f5884b) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -210,6 +210,7 @@ LOCAL_SRC_FILES += \
		core/java/android/service/dreams/IDozeHardware.aidl \
		core/java/android/service/dreams/IDreamManager.aidl \
		core/java/android/service/dreams/IDreamService.aidl \
		core/java/android/service/persistentdata/IPersistentDataBlockService.aidl \
		core/java/android/service/fingerprint/IFingerprintService.aidl \
		core/java/android/service/fingerprint/IFingerprintServiceReceiver.aidl \
		core/java/android/service/trust/ITrustAgentService.aidl \

api/current.txt

+0 −29

Original line number	Diff line number	Diff line
		@@ -47731,7 +47731,6 @@ package java.util {
		ctor public Locale(java.lang.String, java.lang.String);
		ctor public Locale(java.lang.String, java.lang.String, java.lang.String);
		method public java.lang.Object clone();
		method public static java.util.Locale forLanguageTag(java.lang.String);
		method public static java.util.Locale[] getAvailableLocales();
		method public java.lang.String getCountry();
		method public static java.util.Locale getDefault();
		@@ -47741,24 +47740,15 @@ package java.util {
		method public java.lang.String getDisplayLanguage(java.util.Locale);
		method public final java.lang.String getDisplayName();
		method public java.lang.String getDisplayName(java.util.Locale);
		method public java.lang.String getDisplayScript();
		method public java.lang.String getDisplayScript(java.util.Locale);
		method public final java.lang.String getDisplayVariant();
		method public java.lang.String getDisplayVariant(java.util.Locale);
		method public java.lang.String getExtension(char);
		method public java.util.Set<java.lang.Character> getExtensionKeys();
		method public java.lang.String getISO3Country();
		method public java.lang.String getISO3Language();
		method public static java.lang.String[] getISOCountries();
		method public static java.lang.String[] getISOLanguages();
		method public java.lang.String getLanguage();
		method public java.lang.String getScript();
		method public java.util.Set<java.lang.String> getUnicodeLocaleAttributes();
		method public java.util.Set<java.lang.String> getUnicodeLocaleKeys();
		method public java.lang.String getUnicodeLocaleType(java.lang.String);
		method public java.lang.String getVariant();
		method public static synchronized void setDefault(java.util.Locale);
		method public java.lang.String toLanguageTag();
		method public final java.lang.String toString();
		field public static final java.util.Locale CANADA;
		field public static final java.util.Locale CANADA_FRENCH;
		@@ -47776,33 +47766,14 @@ package java.util {
		field public static final java.util.Locale KOREA;
		field public static final java.util.Locale KOREAN;
		field public static final java.util.Locale PRC;
		field public static final char PRIVATE_USE_EXTENSION = 120; // 0x0078 'x'
		field public static final java.util.Locale ROOT;
		field public static final java.util.Locale SIMPLIFIED_CHINESE;
		field public static final java.util.Locale TAIWAN;
		field public static final java.util.Locale TRADITIONAL_CHINESE;
		field public static final java.util.Locale UK;
		field public static final char UNICODE_LOCALE_EXTENSION = 117; // 0x0075 'u'
		field public static final java.util.Locale US;
		}

		public static final class Locale.Builder {
		ctor public Locale.Builder();
		method public java.util.Locale.Builder addUnicodeLocaleAttribute(java.lang.String);
		method public java.util.Locale build();
		method public java.util.Locale.Builder clear();
		method public java.util.Locale.Builder clearExtensions();
		method public java.util.Locale.Builder removeUnicodeLocaleAttribute(java.lang.String);
		method public java.util.Locale.Builder setExtension(char, java.lang.String);
		method public java.util.Locale.Builder setLanguage(java.lang.String);
		method public java.util.Locale.Builder setLanguageTag(java.lang.String);
		method public java.util.Locale.Builder setLocale(java.util.Locale);
		method public java.util.Locale.Builder setRegion(java.lang.String);
		method public java.util.Locale.Builder setScript(java.lang.String);
		method public java.util.Locale.Builder setUnicodeLocaleKeyword(java.lang.String, java.lang.String);
		method public java.util.Locale.Builder setVariant(java.lang.String);
		}

		public abstract interface Map {
		method public abstract void clear();
		method public abstract boolean containsKey(java.lang.Object);

core/java/android/app/ContextImpl.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import android.net.wifi.IWifiScanner;
		import android.net.wifi.WifiScanner;
		import android.os.Build;

		import android.service.persistentdata.IPersistentDataBlockService;
		import android.service.persistentdata.PersistentDataBlockManager;
		import com.android.internal.policy.PolicyManager;
		import com.android.internal.util.Preconditions;

		@@ -734,6 +736,13 @@ class ContextImpl extends Context {
		IBinder b = ServiceManager.getService(JOB_SCHEDULER_SERVICE);
		return new JobSchedulerImpl(IJobScheduler.Stub.asInterface(b));
		}});

		registerService(PERSISTENT_DATA_BLOCK_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(PERSISTENT_DATA_BLOCK_SERVICE);
		return new PersistentDataBlockManager(
		IPersistentDataBlockService.Stub.asInterface(b));
		}});
		}

		static ContextImpl getImpl(Context context) {

core/java/android/content/Context.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -2800,6 +2800,16 @@ public abstract class Context {
		*/
		public static final String JOB_SCHEDULER_SERVICE = "jobscheduler";

		/**
		* Use with {@link #getSystemService} to retrieve a {@link
		* android.service.persistentdata.PersistentDataBlockManager} instance retrieving
		* a file descriptor for a persistent data block.
		* @see #getSystemService
		* @see android.service.persistentdata.PersistentDataBlockManager
		* @hide
		*/
		public static final String PERSISTENT_DATA_BLOCK_SERVICE = "persistent_data_block";

		/**
		* Determine whether the given permission is allowed for a particular
		* process and user ID running in the system.

core/java/android/service/persistentdata/IPersistentDataBlockService.aidl

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		package android.service.persistentdata;

		import android.os.ParcelFileDescriptor;

		/**
		* Internal interface through which to communicate to the
		* PersistentDataBlockService. The persistent data block allows writing
		* raw data and setting the OEM unlock enabled/disabled bit contained
		* in the partition.
		*
		* @hide
		*/
		interface IPersistentDataBlockService {
		int write(in byte[] data);
		int read(out byte[] data);
		int getDataBlockSize();

		void setOemUnlockEnabled(boolean enabled);
		boolean getOemUnlockEnabled();
		}