Replace some hidden API/constant usages with public/system alternatives.
Test: basic sanity
Bug: 137202333
Merged-in: I32559848ad812ad42d931f5e6d3488ceec9dcb8d
Change-Id: I32559848ad812ad42d931f5e6d3488ceec9dcb8d
(cherry picked from commit b8f132016ce71382ebe154e909589f04942d0a6b)
diff --git a/sip/src/com/android/services/telephony/sip/SipIncomingCallReceiver.java b/sip/src/com/android/services/telephony/sip/SipIncomingCallReceiver.java
index 3212c00..2dbd707 100644
--- a/sip/src/com/android/services/telephony/sip/SipIncomingCallReceiver.java
+++ b/sip/src/com/android/services/telephony/sip/SipIncomingCallReceiver.java
@@ -84,7 +84,7 @@
}
private boolean isRunningInSystemUser() {
- return UserHandle.myUserId() == UserHandle.USER_SYSTEM;
+ return UserHandle.myUserId() == UserHandle.SYSTEM.getIdentifier();
}
private static void log(String msg) {
diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index f9938ce..23a9649 100644
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -21,6 +21,7 @@
import android.bluetooth.BluetoothProfile;
import android.content.Context;
import android.media.AudioManager;
+import android.media.AudioSystem;
import android.media.ToneGenerator;
import android.os.AsyncResult;
import android.os.Handler;
@@ -392,10 +393,10 @@
try {
int stream;
if (mBluetoothHeadset != null) {
- stream = isBluetoothAudioOn() ? AudioManager.STREAM_BLUETOOTH_SCO :
- AudioManager.STREAM_VOICE_CALL;
+ stream = isBluetoothAudioOn() ? AudioSystem.STREAM_BLUETOOTH_SCO :
+ AudioSystem.STREAM_VOICE_CALL;
} else {
- stream = AudioManager.STREAM_VOICE_CALL;
+ stream = AudioSystem.STREAM_VOICE_CALL;
}
toneGenerator = new ToneGenerator(stream, toneVolume);
// if (DBG) log("- created toneGenerator: " + toneGenerator);
diff --git a/src/com/android/phone/EmergencyActionGroup.java b/src/com/android/phone/EmergencyActionGroup.java
index 53ec1eb..4961a69 100644
--- a/src/com/android/phone/EmergencyActionGroup.java
+++ b/src/com/android/phone/EmergencyActionGroup.java
@@ -159,7 +159,7 @@
if (v.getId() == R.id.action1 || v.getId() == R.id.action2 || v.getId() == R.id.action3) {
AccessibilityManager accessibilityMgr =
- (AccessibilityManager) mContext.getSystemService(
+ (AccessibilityManager) getContext().getSystemService(
Context.ACCESSIBILITY_SERVICE);
if (accessibilityMgr.isTouchExplorationEnabled()) {
getContext().startActivity(intent);
diff --git a/src/com/android/phone/EmergencyInfoGroup.java b/src/com/android/phone/EmergencyInfoGroup.java
index f5aca7f..a62edfd 100644
--- a/src/com/android/phone/EmergencyInfoGroup.java
+++ b/src/com/android/phone/EmergencyInfoGroup.java
@@ -209,7 +209,7 @@
public void onClick(View view) {
if (view.getId() == R.id.emergency_info_view) {
AccessibilityManager accessibilityMgr =
- (AccessibilityManager) mContext.getSystemService(
+ (AccessibilityManager) getContext().getSystemService(
Context.ACCESSIBILITY_SERVICE);
if (accessibilityMgr.isTouchExplorationEnabled()) {
if (mOnConfirmClickListener != null) {
diff --git a/src/com/android/phone/EmergencyShortcutButton.java b/src/com/android/phone/EmergencyShortcutButton.java
index d147ce4..bfa956c 100644
--- a/src/com/android/phone/EmergencyShortcutButton.java
+++ b/src/com/android/phone/EmergencyShortcutButton.java
@@ -184,7 +184,7 @@
public void onClick(View view) {
if (view.getId() == R.id.emergency_call_number_info_view) {
AccessibilityManager accessibilityMgr =
- (AccessibilityManager) mContext.getSystemService(
+ (AccessibilityManager) getContext().getSystemService(
Context.ACCESSIBILITY_SERVICE);
if (accessibilityMgr.isTouchExplorationEnabled()) {
// TalkBack itself includes a prompt to confirm click action implicitly,
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 009ea43..5e34fac 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -117,7 +117,6 @@
import android.util.ArraySet;
import android.util.Log;
import android.util.Pair;
-import android.util.Slog;
import com.android.ims.ImsManager;
import com.android.ims.internal.IImsServiceFeatureCallback;
@@ -5825,7 +5824,7 @@
PackageManager.MATCH_DISABLED_COMPONENTS
| PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
| PackageManager.GET_SIGNING_CERTIFICATES,
- UserHandle.USER_SYSTEM);
+ UserHandle.SYSTEM.getIdentifier());
}
for (int p = packages.size() - 1; p >= 0; p--) {
PackageInfo pkgInfo = packages.get(p);
@@ -5888,7 +5887,7 @@
final String subscriberId = phone.getSubscriberId();
if (DBG_MERGE) {
- Slog.d(LOG_TAG, "Setting line number for ICC=" + iccId + ", subscriberId="
+ Rlog.d(LOG_TAG, "Setting line number for ICC=" + iccId + ", subscriberId="
+ subscriberId + " to " + number);
}
@@ -6014,7 +6013,7 @@
final String numberKey = PREF_CARRIERS_NUMBER_PREFIX + iccId;
mergeNumber = (String) prefs.get(numberKey);
if (DBG_MERGE) {
- Slog.d(LOG_TAG, "Found line number " + mergeNumber
+ Rlog.d(LOG_TAG, "Found line number " + mergeNumber
+ " for active subscriber " + subscriberId);
}
if (!TextUtils.isEmpty(mergeNumber)) {
@@ -6048,7 +6047,7 @@
final String[] resultArray = result.toArray(new String[result.size()]);
Arrays.sort(resultArray);
if (DBG_MERGE) {
- Slog.d(LOG_TAG,
+ Rlog.d(LOG_TAG,
"Found subscribers " + Arrays.toString(resultArray) + " after merge");
}
return resultArray;