PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changing apk name in the manifest and the corresponding packages.

Browse Source 
BUG: 226403247
Test: TH
Change-Id: I49ad1169899ffbb76ad00f7d5d02f815ace295e7
This commit is contained in:
Roopa Sattiraju
2022-03-24 10:30:03 -07:00
parent e7f902f21c
commit 64f9d41ee3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
View File

@@ -126,7 +126,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
// "Clear All Notifications" button // "Clear All Notifications" button
Intent deleteIntent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY); Intent deleteIntent = new Intent(BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY);
deleteIntent.setPackage("com.android.bluetooth"); deleteIntent.setPackage("com.android.bluetooth.services");
deleteIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice); deleteIntent.putExtra(BluetoothDevice.EXTRA_DEVICE, mDevice);
deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT, deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
BluetoothDevice.CONNECTION_ACCESS_NO); BluetoothDevice.CONNECTION_ACCESS_NO);

4
src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
View File

@@ -47,10 +47,10 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceController extends
try { try {
Resources res = context.getPackageManager().getResourcesForApplication( Resources res = context.getPackageManager().getResourcesForApplication(
"com.android.bluetooth"); "com.android.bluetooth.services");
mDefaultMaxConnectedAudioDevices = res.getInteger(res.getIdentifier( mDefaultMaxConnectedAudioDevices = res.getInteger(res.getIdentifier(
"config_bluetooth_max_connected_audio_devices", "config_bluetooth_max_connected_audio_devices",
"integer", "com.android.bluetooth")); "integer", "com.android.bluetooth.services"));
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} }

4
tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
View File

@@ -70,8 +70,8 @@ public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest {
mPreference.setEntryValues(R.array.bluetooth_max_connected_audio_devices_values); mPreference.setEntryValues(R.array.bluetooth_max_connected_audio_devices_values);
// Retrieve default max connected audio devices to a test controlled value // Retrieve default max connected audio devices to a test controlled value
try { try {
Resources res = mSpyContext.getPackageManager().getResourcesForApplication("com.android.bluetooth"); Resources res = mSpyContext.getPackageManager().getResourcesForApplication("com.android.bluetooth.services");
TEST_MAX_CONNECTED_AUDIO_DEVICES = res.getInteger(res.getIdentifier("config_bluetooth_max_connected_audio_devices", "integer", "com.android.bluetooth")); TEST_MAX_CONNECTED_AUDIO_DEVICES = res.getInteger(res.getIdentifier("config_bluetooth_max_connected_audio_devices", "integer", "com.android.bluetooth.services"));
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
} }