Merge "Stop trying to get/set fields in FDE footer" into tm-dev (87d60042) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/LockPatternUtils.java

+1 −59

Original line number	Diff line number	Diff line
		@@ -722,38 +722,14 @@ public class LockPatternUtils {
		return true;
		}

		private void updateCryptoUserInfo(int userId) {
		if (userId != UserHandle.USER_SYSTEM) {
		return;
		}

		final String ownerInfo = isOwnerInfoEnabled(userId) ? getOwnerInfo(userId) : "";

		IBinder service = ServiceManager.getService("mount");
		if (service == null) {
		Log.e(TAG, "Could not find the mount service to update the user info");
		return;
		}

		IStorageManager storageManager = IStorageManager.Stub.asInterface(service);
		try {
		Log.d(TAG, "Setting owner info");
		storageManager.setField(StorageManager.OWNER_INFO_KEY, ownerInfo);
		} catch (RemoteException e) {
		Log.e(TAG, "Error changing user info", e);
		}
		}

		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void setOwnerInfo(String info, int userId) {
		setString(LOCK_SCREEN_OWNER_INFO, info, userId);
		updateCryptoUserInfo(userId);
		}

		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void setOwnerInfoEnabled(boolean enabled, int userId) {
		setBoolean(LOCK_SCREEN_OWNER_INFO_ENABLED, enabled, userId);
		updateCryptoUserInfo(userId);
		}

		@UnsupportedAppUsage
		@@ -1042,24 +1018,6 @@ public class LockPatternUtils {
		*/
		public void setVisiblePatternEnabled(boolean enabled, int userId) {
		setBoolean(Settings.Secure.LOCK_PATTERN_VISIBLE, enabled, userId);

		// Update for crypto if owner
		if (userId != UserHandle.USER_SYSTEM) {
		return;
		}

		IBinder service = ServiceManager.getService("mount");
		if (service == null) {
		Log.e(TAG, "Could not find the mount service to update the user info");
		return;
		}

		IStorageManager storageManager = IStorageManager.Stub.asInterface(service);
		try {
		storageManager.setField(StorageManager.PATTERN_VISIBLE_KEY, enabled ? "1" : "0");
		} catch (RemoteException e) {
		Log.e(TAG, "Error changing pattern visible state", e);
		}
		}

		public boolean isVisiblePatternEverChosen(int userId) {
		@@ -1070,23 +1028,7 @@ public class LockPatternUtils {
		* Set whether the visible password is enabled for cryptkeeper screen.
		*/
		public void setVisiblePasswordEnabled(boolean enabled, int userId) {
		// Update for crypto if owner
		if (userId != UserHandle.USER_SYSTEM) {
		return;
		}

		IBinder service = ServiceManager.getService("mount");
		if (service == null) {
		Log.e(TAG, "Could not find the mount service to update the user info");
		return;
		}

		IStorageManager storageManager = IStorageManager.Stub.asInterface(service);
		try {
		storageManager.setField(StorageManager.PASSWORD_VISIBLE_KEY, enabled ? "1" : "0");
		} catch (RemoteException e) {
		Log.e(TAG, "Error changing password visible state", e);
		}
		// No longer does anything.
		}

		/**

services/core/java/com/android/server/StorageManagerService.java

+0 −35

Original line number	Diff line number	Diff line
		@@ -75,7 +75,6 @@ import android.content.pm.PackageManager;
		import android.content.pm.PackageManagerInternal;
		import android.content.pm.ProviderInfo;
		import android.content.pm.UserInfo;
		import android.content.res.Configuration;
		import android.content.res.ObbInfo;
		import android.database.ContentObserver;
		import android.net.Uri;
		@@ -124,7 +123,6 @@ import android.provider.Downloads;
		import android.provider.MediaStore;
		import android.provider.Settings;
		import android.service.storage.ExternalStorageService;
		import android.sysprop.VoldProperties;
		import android.text.TextUtils;
		import android.text.format.DateUtils;
		import android.util.ArrayMap;
		@@ -1407,39 +1405,6 @@ class StorageManagerService extends IStorageManager.Stub
		private void handleDaemonConnected() {
		initIfBootedAndConnected();
		resetIfBootedAndConnected();

		// On an encrypted device we can't see system properties yet, so pull
		// the system locale out of the mount service.
		if ("".equals(VoldProperties.encrypt_progress().orElse(""))) {
		copyLocaleFromMountService();
		}
		}

		private void copyLocaleFromMountService() {
		String systemLocale;
		try {
		systemLocale = getField(StorageManager.SYSTEM_LOCALE_KEY);
		} catch (RemoteException e) {
		return;
		}
		if (TextUtils.isEmpty(systemLocale)) {
		return;
		}

		Slog.d(TAG, "Got locale " + systemLocale + " from mount service");
		Locale locale = Locale.forLanguageTag(systemLocale);
		Configuration config = new Configuration();
		config.setLocale(locale);
		try {
		ActivityManager.getService().updatePersistentConfigurationWithAttribution(config,
		mContext.getOpPackageName(), mContext.getAttributionTag());
		} catch (RemoteException e) {
		Slog.e(TAG, "Error setting system locale from mount service", e);
		}

		// Temporary workaround for http://b/17945169.
		Slog.d(TAG, "Setting system properties to " + systemLocale + " from mount service");
		SystemProperties.set("persist.sys.locale", locale.toLanguageTag());
		}

		private final IVoldListener mListener = new IVoldListener.Stub() {

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+0 −18

Original line number	Diff line number	Diff line
		@@ -205,8 +205,6 @@ import android.os.UpdateLock;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.os.WorkSource;
		import android.os.storage.IStorageManager;
		import android.os.storage.StorageManager;
		import android.provider.Settings;
		import android.service.dreams.DreamActivity;
		import android.service.dreams.DreamManagerInternal;
		@@ -4300,11 +4298,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		SystemProperties.set("persist.sys.locale",
		locales.get(bestLocaleIndex).toLanguageTag());
		LocaleList.setDefault(locales, bestLocaleIndex);

		final Message m = PooledLambda.obtainMessage(
		ActivityTaskManagerService::sendLocaleToMountDaemonMsg, this,
		locales.get(bestLocaleIndex));
		mH.sendMessage(m);
		}

		mTempConfig.seq = increaseConfigurationSeqLocked();
		@@ -4458,17 +4451,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		Settings.System.putConfigurationForUser(resolver, config, userId);
		}

		private void sendLocaleToMountDaemonMsg(Locale l) {
		try {
		IBinder service = ServiceManager.getService("mount");
		IStorageManager storageManager = IStorageManager.Stub.asInterface(service);
		Log.d(TAG, "Storing locale " + l.toLanguageTag() + " for decryption UI");
		storageManager.setField(StorageManager.SYSTEM_LOCALE_KEY, l.toLanguageTag());
		} catch (RemoteException e) {
		Log.e(TAG, "Error storing locale for decryption UI", e);
		}
		}

		private void expireStartAsCallerTokenMsg(IBinder permissionToken) {
		mStartActivitySources.remove(permissionToken);
		mExpiredStartAsCallerTokens.add(permissionToken);