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

Commit aab002bd authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge changes I54a4a41a,Ic067c9c3,I491f40dd,I3a2ce935,I3df2549c,Icba928ce 

* changes:
  Make ActivityManagerService just kill apps when they crash on headless devices.
  Add support for disabling wallpaper service
  Fix merge problem
  Add the ability to pass float extras to AM.
  Adding a feature to indicate specific support for Bluetooth API.
  SystemServer: Add support for disabling AudioService and MountService
parents ab3ea05d 54a4a41a

cmds/am/src/com/android/commands/am/Am.java

+18 −0
Original line number Diff line number Diff line
@@ -215,6 +215,22 @@ public class Am { 
                    list[i] = Long.valueOf(strings[i]);

                }

                intent.putExtra(key, list);

                hasIntentInfo = true;

            } else if (opt.equals("--ef")) {

                String key = nextArgRequired();

                String value = nextArgRequired();

                intent.putExtra(key, Float.valueOf(value));

                hasIntentInfo = true;

            } else if (opt.equals("--efa")) {

                String key = nextArgRequired();

                String value = nextArgRequired();

                String[] strings = value.split(",");

                float[] list = new float[strings.length];

                for (int i = 0; i < strings.length; i++) {

                    list[i] = Float.valueOf(strings[i]);

                }

                intent.putExtra(key, list);

                hasIntentInfo = true;

            } else if (opt.equals("--ez")) {

                String key = nextArgRequired();

                String value = nextArgRequired();
@@ -1342,9 +1358,11 @@ public class Am { 
                "    [--ez <EXTRA_KEY> <EXTRA_BOOLEAN_VALUE> ...]\n" +

                "    [--ei <EXTRA_KEY> <EXTRA_INT_VALUE> ...]\n" +

                "    [--el <EXTRA_KEY> <EXTRA_LONG_VALUE> ...]\n" +

                "    [--ef <EXTRA_KEY> <EXTRA_FLOAT_VALUE> ...]\n" +

                "    [--eu <EXTRA_KEY> <EXTRA_URI_VALUE> ...]\n" +

                "    [--eia <EXTRA_KEY> <EXTRA_INT_VALUE>[,<EXTRA_INT_VALUE...]]\n" +

                "    [--ela <EXTRA_KEY> <EXTRA_LONG_VALUE>[,<EXTRA_LONG_VALUE...]]\n" +

                "    [--efa <EXTRA_KEY> <EXTRA_FLOAT_VALUE>[,<EXTRA_FLOAT_VALUE...]]\n" +

                "    [-n <COMPONENT>] [-f <FLAGS>]\n" +

                "    [--grant-read-uri-permission] [--grant-write-uri-permission]\n" +

                "    [--debug-log-resolution] [--exclude-stopped-packages]\n" +

core/java/android/app/WallpaperManager.java

+31 −2
Original line number Diff line number Diff line
@@ -433,7 +433,12 @@ public class WallpaperManager { 
     */

    public WallpaperInfo getWallpaperInfo() {

        try {

            if (sGlobals.mService == null) {

                Log.w(TAG, "WallpaperService not running");

                return null;

            } else {

                return sGlobals.mService.getWallpaperInfo();

            }

        } catch (RemoteException e) {

            return null;

        }
@@ -451,6 +456,10 @@ public class WallpaperManager { 
     * wallpaper.

     */

    public void setResource(int resid) throws IOException {

        if (sGlobals.mService == null) {

            Log.w(TAG, "WallpaperService not running");

            return;

        }

        try {

            Resources resources = mContext.getResources();

            /* Set the wallpaper to the default values */
@@ -483,6 +492,10 @@ public class WallpaperManager { 
     * wallpaper.

     */

    public void setBitmap(Bitmap bitmap) throws IOException {

        if (sGlobals.mService == null) {

            Log.w(TAG, "WallpaperService not running");

            return;

        }

        try {

            ParcelFileDescriptor fd = sGlobals.mService.setWallpaper(null);

            if (fd == null) {
@@ -515,6 +528,10 @@ public class WallpaperManager { 
     * wallpaper.

     */

    public void setStream(InputStream data) throws IOException {

        if (sGlobals.mService == null) {

            Log.w(TAG, "WallpaperService not running");

            return;

        }

        try {

            ParcelFileDescriptor fd = sGlobals.mService.setWallpaper(null);

            if (fd == null) {
@@ -558,6 +575,10 @@ public class WallpaperManager { 
     * mandatory.

     */

    public int getDesiredMinimumWidth() {

        if (sGlobals.mService == null) {

            Log.w(TAG, "WallpaperService not running");

            return 0;

        }

        try {

            return sGlobals.mService.getWidthHint();

        } catch (RemoteException e) {
@@ -581,6 +602,10 @@ public class WallpaperManager { 
     * mandatory.

     */

    public int getDesiredMinimumHeight() {

        if (sGlobals.mService == null) {

            Log.w(TAG, "WallpaperService not running");

            return 0;

        }

        try {

            return sGlobals.mService.getHeightHint();

        } catch (RemoteException e) {
@@ -599,7 +624,11 @@ public class WallpaperManager { 
     */

    public void suggestDesiredDimensions(int minimumWidth, int minimumHeight) {

        try {

            if (sGlobals.mService == null) {

                Log.w(TAG, "WallpaperService not running");

            } else {

                sGlobals.mService.setDimensionHints(minimumWidth, minimumHeight);

            }

        } catch (RemoteException e) {

            // Ignore

        }

core/java/android/os/storage/StorageManager.java

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.os.storage;



import android.os.Environment;

import android.os.Handler;

import android.os.Looper;

import android.os.Message;
@@ -534,6 +535,7 @@ public class StorageManager 
     * @hide

     */

    public String getVolumeState(String mountPoint) {

         if (mMountService == null) return Environment.MEDIA_REMOVED;

        try {

            return mMountService.getVolumeState(mountPoint);

        } catch (RemoteException e) {
@@ -547,6 +549,7 @@ public class StorageManager 
     * @hide

     */

    public StorageVolume[] getVolumeList() {

        if (mMountService == null) return new StorageVolume[0];

        try {

            Parcelable[] list = mMountService.getVolumeList();

            if (list == null) return new StorageVolume[0];

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -545,6 +545,9 @@ 
         specified -->

    <string name="default_wallpaper_component" translatable="false">@null</string>



    <!-- True if WallpaperService is enabled -->

    <bool name="config_enableWallpaperService">true</bool>



    <!-- Component name of the service providing network location support. -->

    <string name="config_networkLocationProvider" translatable="false">@null</string>

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ 
  <java-symbol type="bool" name="skip_restoring_network_selection" />

  <java-symbol type="bool" name="split_action_bar_is_narrow" />

  <java-symbol type="bool" name="config_useMasterVolume" />

  <java-symbol type="bool" name="config_enableWallpaperService" />



  <java-symbol type="integer" name="config_cursorWindowSize" />

  <java-symbol type="integer" name="config_longPressOnPowerBehavior" />