Merge changes Ie283981d,Ie3f735e4,I6818966f,I4ca93d9b,Iabd46505 (49dac3d4) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/BasebandVersionPreferenceController.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -21,9 +21,14 @@ import android.support.v7.preference.Preference;

	import com.android.settings.R;		import com.android.settings.R;
	import com.android.settings.core.PreferenceControllerMixin;		import com.android.settings.core.PreferenceControllerMixin;
			import com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController;
	import com.android.settingslib.Utils;		import com.android.settingslib.Utils;
	import com.android.settingslib.core.AbstractPreferenceController;		import com.android.settingslib.core.AbstractPreferenceController;

			/**
			* deprecated in favor of {@link BasebandVersionDialogController}
			*/
			@Deprecated
	public class BasebandVersionPreferenceController extends AbstractPreferenceController implements		public class BasebandVersionPreferenceController extends AbstractPreferenceController implements
	PreferenceControllerMixin {		PreferenceControllerMixin {

src/com/android/settings/deviceinfo/SecurityPatchPreferenceController.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,9 +23,14 @@ import android.text.TextUtils;
	import android.util.Log;		import android.util.Log;

	import com.android.settings.core.PreferenceControllerMixin;		import com.android.settings.core.PreferenceControllerMixin;
			import com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController;
	import com.android.settingslib.DeviceInfoUtils;		import com.android.settingslib.DeviceInfoUtils;
	import com.android.settingslib.core.AbstractPreferenceController;		import com.android.settingslib.core.AbstractPreferenceController;

			/**
			* deprecated in favor of {@link SecurityPatchLevelDialogController}
			*/
			@Deprecated
	public class SecurityPatchPreferenceController extends AbstractPreferenceController implements		public class SecurityPatchPreferenceController extends AbstractPreferenceController implements
	PreferenceControllerMixin {		PreferenceControllerMixin {

src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java

0 → 100644

+55 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2017 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.settings.deviceinfo.firmwareversion;

			import android.content.Context;
			import android.os.SystemProperties;
			import android.support.annotation.VisibleForTesting;

			import com.android.settings.R;
			import com.android.settings.Utils;

			public class BasebandVersionDialogController {

			@VisibleForTesting
			static final int BASEBAND_VERSION_LABEL_ID = R.id.baseband_version_label;
			@VisibleForTesting
			static final int BASEBAND_VERSION_VALUE_ID = R.id.baseband_version_value;
			@VisibleForTesting
			static final String BASEBAND_PROPERTY = "gsm.version.baseband";

			private final FirmwareVersionDialogFragment mDialog;

			public BasebandVersionDialogController(FirmwareVersionDialogFragment dialog) {
			mDialog = dialog;
			}

			/**
			* Updates the baseband version field of the dialog.
			*/
			public void initialize() {
			final Context context = mDialog.getContext();
			if (Utils.isWifiOnly(context)) {
			mDialog.removeSettingFromScreen(BASEBAND_VERSION_LABEL_ID);
			mDialog.removeSettingFromScreen(BASEBAND_VERSION_VALUE_ID);
			return;
			}

			mDialog.setText(BASEBAND_VERSION_VALUE_ID, SystemProperties.get(BASEBAND_PROPERTY,
			context.getString(R.string.device_info_default)));
			}
			}

src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java

0 → 100644

+43 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2017 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.settings.deviceinfo.firmwareversion;

			import android.os.Build;
			import android.support.annotation.VisibleForTesting;
			import android.text.BidiFormatter;

			import com.android.settings.R;

			public class BuildNumberDialogController {

			@VisibleForTesting
			static final int BUILD_NUMBER_VALUE_ID = R.id.build_number_value;

			private final FirmwareVersionDialogFragment mDialog;

			public BuildNumberDialogController(FirmwareVersionDialogFragment dialog) {
			mDialog = dialog;
			}

			/**
			* Updates the build number to the dialog.
			*/
			public void initialize() {
			mDialog.setText(BUILD_NUMBER_VALUE_ID,
			BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
			}
			}

src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java

0 → 100644

+112 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2017 The Android Open Source Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.settings.deviceinfo.firmwareversion;

			import android.content.Context;
			import android.content.Intent;
			import android.os.Build;
			import android.os.SystemClock;
			import android.os.UserHandle;
			import android.os.UserManager;
			import android.support.annotation.VisibleForTesting;
			import android.util.Log;
			import android.view.View;

			import com.android.settings.R;
			import com.android.settingslib.RestrictedLockUtils;

			public class FirmwareVersionDialogController implements View.OnClickListener {

			private static final String TAG = "firmwareDialogCtrl";
			private static final int DELAY_TIMER_MILLIS = 500;
			private static final int ACTIVITY_TRIGGER_COUNT = 3;

			@VisibleForTesting
			static final int FIRMWARE_VERSION_VALUE_ID = R.id.firmware_version_value;
			@VisibleForTesting
			static final int FIRMWARE_VERSION_LABEL_ID = R.id.firmware_version_label;

			private final FirmwareVersionDialogFragment mDialog;
			private final Context mContext;
			private final UserManager mUserManager;
			private final long[] mHits = new long[ACTIVITY_TRIGGER_COUNT];

			private RestrictedLockUtils.EnforcedAdmin mFunDisallowedAdmin;
			private boolean mFunDisallowedBySystem;

			public FirmwareVersionDialogController(FirmwareVersionDialogFragment dialog) {
			mDialog = dialog;
			mContext = dialog.getContext();
			mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
			}

			@Override
			public void onClick(View v) {
			arrayCopy();
			mHits[mHits.length - 1] = SystemClock.uptimeMillis();
			if (mHits[0] >= (SystemClock.uptimeMillis() - DELAY_TIMER_MILLIS)) {
			if (mUserManager.hasUserRestriction(UserManager.DISALLOW_FUN)) {
			if (mFunDisallowedAdmin != null && !mFunDisallowedBySystem) {
			RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext,
			mFunDisallowedAdmin);
			}
			Log.d(TAG, "Sorry, no fun for you!");
			return;
			}

			final Intent intent = new Intent(Intent.ACTION_MAIN)
			.setClassName(
			"android", com.android.internal.app.PlatLogoActivity.class.getName());
			try {
			mContext.startActivity(intent);
			} catch (Exception e) {
			Log.e(TAG, "Unable to start activity " + intent.toString());
			}
			}
			}

			/**
			* Populates the Android version field in the dialog and registers click listeners.
			*/
			public void initialize() {
			initializeAdminPermissions();
			registerClickListeners();

			mDialog.setText(FIRMWARE_VERSION_VALUE_ID, Build.VERSION.RELEASE);
			}

			private void registerClickListeners() {
			mDialog.registerClickListener(FIRMWARE_VERSION_LABEL_ID, this /* listener */);
			mDialog.registerClickListener(FIRMWARE_VERSION_VALUE_ID, this /* listener */);
			}

			/**
			* Copies the array onto itself to remove the oldest hit.
			*/
			@VisibleForTesting
			void arrayCopy() {
			System.arraycopy(mHits, 1, mHits, 0, mHits.length - 1);
			}

			@VisibleForTesting
			void initializeAdminPermissions() {
			mFunDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(
			mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
			mFunDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
			mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
			}
			}