Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a6794ca authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "Changes to Bluetooth Service structure."

parents a0a69897 1abb1cb3

cmds/servicemanager/service_manager.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ static struct { 
    { AID_MEDIA, "media.audio_policy" },

    { AID_DRM,   "drm.drmManager" },

    { AID_NFC,   "nfc" },

    { AID_BLUETOOTH, "bluetooth" },

    { AID_RADIO, "radio.phone" },

    { AID_RADIO, "radio.sms" },

    { AID_RADIO, "radio.phonesubinfo" },

core/java/android/app/ContextImpl.java

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.app; 


import com.android.internal.policy.PolicyManager;



import android.bluetooth.BluetoothAdapter;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentResolver;
@@ -294,6 +295,11 @@ class ContextImpl extends Context { 
                    return new MediaRouter(ctx);

                }});



        registerService(BLUETOOTH_SERVICE, new ServiceFetcher() {

                public Object createService(ContextImpl ctx) {

                    return BluetoothAdapter.getDefaultAdapter();

                }});



        registerService(CLIPBOARD_SERVICE, new ServiceFetcher() {

                public Object createService(ContextImpl ctx) {

                    return new ClipboardManager(ctx.getOuterContext(),

core/java/android/content/Context.java

+9 −0
Original line number Diff line number Diff line
@@ -1905,6 +1905,15 @@ public abstract class Context { 
     */

    public static final String NFC_SERVICE = "nfc";



    /**

     * Use with {@link #getSystemService} to retrieve a

     * {@link android.bluetooth.BluetoothAdapter} for using Bluetooth.

     *

     * @see #getSystemService

     * @hide

     */

    public static final String BLUETOOTH_SERVICE = "bluetooth";



    /**

     * Use with {@link #getSystemService} to retrieve a

     * {@link android.net.sip.SipManager} for accessing the SIP related service.

core/java/android/os/Process.java

+6 −0
Original line number Diff line number Diff line
@@ -115,6 +115,12 @@ public class Process { 
     */

    public static final int NFC_UID = 1027;



    /**

     * Defines the UID/GID for the Bluetooth service process.

     * @hide

     */

    public static final int BLUETOOTH_UID = 1002;



    /**

     * Defines the GID for the group that allows write access to the internal media storage.

     * @hide

services/java/com/android/server/pm/PackageManagerService.java

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
    private static final int RADIO_UID = Process.PHONE_UID;

    private static final int LOG_UID = Process.LOG_UID;

    private static final int NFC_UID = Process.NFC_UID;

    private static final int BLUETOOTH_UID = Process.BLUETOOTH_UID;



    private static final boolean GET_CERTIFICATES = true;
@@ -903,6 +904,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
        mSettings.addSharedUserLPw("android.uid.phone", RADIO_UID, ApplicationInfo.FLAG_SYSTEM);

        mSettings.addSharedUserLPw("android.uid.log", LOG_UID, ApplicationInfo.FLAG_SYSTEM);

        mSettings.addSharedUserLPw("android.uid.nfc", NFC_UID, ApplicationInfo.FLAG_SYSTEM);

        mSettings.addSharedUserLPw("android.uid.bluetooth", BLUETOOTH_UID, ApplicationInfo.FLAG_SYSTEM);



        String separateProcesses = SystemProperties.get("debug.separate_processes");

        if (separateProcesses != null && separateProcesses.length() > 0) {