Snap for 4665576 from 821516f50a59e62b00382a0beb11b63da4059760 to qt-release (6da379f6) · Commits · e / os / android_packages_apps_Dialer

java/com/android/contacts/common/dialog/CallSubjectDialog.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -531,6 +531,9 @@ public class CallSubjectDialog extends Activity {

		TelecomManager telecomManager = (TelecomManager) getSystemService(Context.TELECOM_SERVICE);
		final PhoneAccount account = telecomManager.getPhoneAccount(mPhoneAccountHandle);
		if (account == null) {
		return;
		}

		Bundle phoneAccountExtras = account.getExtras();
		if (phoneAccountExtras == null) {

+4 −3

Original line number	Diff line number	Diff line
		@@ -141,14 +141,15 @@ public final class LegacyVoicemailNotifier {
		if (TelecomUtil.getCallCapablePhoneAccounts(context).size() > 1) {
		TelecomManager telecomManager = context.getSystemService(TelecomManager.class);
		PhoneAccount phoneAccount = telecomManager.getPhoneAccount(handle);
		if (phoneAccount != null) {
		return phoneAccount.getShortDescription().toString();
		} else {
		}
		}
		return String.format(
		context.getString(R.string.notification_voicemail_text_format),
		PhoneNumberHelper.formatNumber(
		context, voicemailNumber, GeoUtil.getCurrentCountryIso(context)));
		}
		}

		public static void cancelNotification(
		@NonNull Context context, @NonNull PhoneAccountHandle phoneAccountHandle) {

+3 −0

Original line number	Diff line number	Diff line
		@@ -241,6 +241,9 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity {
		PhoneAccountHandle result = null;
		for (PhoneAccountHandle phoneAccountHandle : telecomManager.getCallCapablePhoneAccounts()) {
		PhoneAccount phoneAccount = telecomManager.getPhoneAccount(phoneAccountHandle);
		if (phoneAccount == null) {
		continue;
		}
		if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
		LogUtil.i(
		"DialerSettingsActivity.getSoleSimAccount", phoneAccountHandle + " is a SIM account");

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ public abstract class DialerApplication extends Application implements HasRootCo
		new FilteredNumberAsyncQueryHandler(this),
		DialerExecutorComponent.get(this).dialerExecutorFactory())
		.asyncAutoMigrate();
		CallLogComponent.get(this).callLogFramework().registerContentObservers(getApplicationContext());
		CallLogComponent.get(this).callLogFramework().onApplicationCreate(getApplicationContext());
		Futures.addCallback(
		CallLogComponent.get(this).getAnnotatedCallLogMigrator().migrate(),
		new DefaultFutureCallback<>(),

0 → 100644

+32 −0

Original line number	Diff line number	Diff line
		<!--
		~ Copyright (C) 2018 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
		-->
		<manifest xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.dialer.calllog">

		<uses-sdk
		android:minSdkVersion="23"
		android:targetSdkVersion="27"/>

		<application>

		<service
		android:exported="false"
		android:name=".CallLogConfig$PollingJob"
		android:permission="android.permission.BIND_JOB_SERVICE"/>

		</application>

		</manifest>