Merge "Squashed merge of master-sim into master." (9bcef123) · Commits · e / os / android_frameworks_base

Android.mk

+9 −0

Original line number	Diff line number	Diff line
		@@ -278,6 +278,10 @@ LOCAL_SRC_FILES += \
		core/java/android/service/carrier/ICarrierService.aidl \
		core/java/android/service/carrier/ICarrierMessagingCallback.aidl \
		core/java/android/service/carrier/ICarrierMessagingService.aidl \
		core/java/android/service/euicc/IDownloadSubscriptionCallback.aidl \
		core/java/android/service/euicc/IEuiccService.aidl \
		core/java/android/service/euicc/IGetDownloadableSubscriptionMetadataCallback.aidl \
		core/java/android/service/euicc/IGetEidCallback.aidl \
		core/java/android/service/gatekeeper/IGateKeeperService.aidl \
		core/java/android/service/notification/INotificationListener.aidl \
		core/java/android/service/notification/IStatusBarNotificationHolder.aidl \
		@@ -518,6 +522,7 @@ LOCAL_SRC_FILES += \
		telephony/java/com/android/internal/telephony/ITelephony.aidl \
		telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl \
		telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
		telephony/java/com/android/internal/telephony/euicc/IEuiccController.aidl \
		wifi/java/android/net/wifi/IWifiManager.aidl \
		wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.aidl \
		wifi/java/android/net/wifi/aware/IWifiAwareManager.aidl \
		@@ -614,6 +619,8 @@ aidl_files := \
		frameworks/base/telephony/java/android/telephony/IccOpenLogicalChannelResponse.aidl \
		frameworks/base/telephony/java/android/telephony/NeighboringCellInfo.aidl \
		frameworks/base/telephony/java/android/telephony/ModemActivityInfo.aidl \
		frameworks/base/telephony/java/android/telephony/UiccAccessRule.aidl \
		frameworks/base/telephony/java/android/telephony/euicc/DownloadableSubscription.aidl \
		frameworks/base/location/java/android/location/Location.aidl \
		frameworks/base/location/java/android/location/Address.aidl \
		frameworks/base/location/java/android/location/Criteria.aidl \
		@@ -726,6 +733,8 @@ aidl_files := \
		frameworks/base/core/java/android/view/textservice/SuggestionsInfo.aidl \
		frameworks/base/core/java/android/service/carrier/CarrierIdentifier.aidl \
		frameworks/base/core/java/android/service/carrier/MessagePdu.aidl \
		frameworks/base/core/java/android/service/euicc/DownloadResult.aidl \
		frameworks/base/core/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.aidl \
		frameworks/base/core/java/android/service/notification/Adjustment.aidl \
		frameworks/base/core/java/android/service/notification/Condition.aidl \
		frameworks/base/core/java/android/service/notification/SnoozeCriterion.aidl \

core/java/android/app/SystemServiceRegistry.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,7 @@ import android.os.health.SystemHealthManager;
		import android.os.storage.StorageManager;
		import android.print.IPrintManager;
		import android.print.PrintManager;
		import android.telephony.euicc.EuiccManager;
		import android.view.autofill.AutofillManager;
		import android.view.autofill.IAutoFillManager;
		import android.service.persistentdata.IPersistentDataBlockService;
		@@ -493,6 +494,13 @@ final class SystemServiceRegistry {
		return new TelecomManager(ctx.getOuterContext());
		}});

		registerService(Context.EUICC_SERVICE, EuiccManager.class,
		new CachedServiceFetcher<EuiccManager>() {
		@Override
		public EuiccManager createService(ContextImpl ctx) {
		return new EuiccManager(ctx.getOuterContext());
		}});

		registerService(Context.UI_MODE_SERVICE, UiModeManager.class,
		new CachedServiceFetcher<UiModeManager>() {
		@Override

core/java/android/content/Context.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -3453,6 +3453,17 @@ public abstract class Context {
		*/
		public static final String CARRIER_CONFIG_SERVICE = "carrier_config";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.telephony.euicc.EuiccManager} to manage the device eUICC (embedded SIM).
		*
		* @see #getSystemService
		* @see android.telephony.euicc.EuiccManager
		* TODO(b/35851809): Unhide this API.
		* @hide
		*/
		public static final String EUICC_SERVICE = "euicc_service";

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.text.ClipboardManager} for accessing and modifying

core/java/android/content/pm/PackageManager.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -1957,6 +1957,15 @@ public abstract class PackageManager {
		public static final String FEATURE_TELEPHONY_CARRIERLOCK =
		"android.hardware.telephony.carrierlock";

		/**
		* Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: The device
		* supports embedded subscriptions on eUICCs.
		* TODO(b/35851809): Make this public.
		* @hide
		*/
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_TELEPHONY_EUICC = "android.hardware.telephony.euicc";

		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The device supports connecting to USB devices

core/java/android/service/euicc/DownloadResult.aidl

0 → 100644

+19 −0

Original line number	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 android.service.euicc;

		parcelable DownloadResult;