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

Commit 45ecf294 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Fix issue #26695393: Remove NEW_PICTURE and NEW_VIDEO broadcast 

Ignored!  Removed!  A non-broadcast!

Any attempt to send these will be silently (except a log)
ignored.

Change-Id: Ia19357d4c90fdcd18e45f2b41c57e654ef94edb1
parent 737a1c10

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -13201,8 +13201,8 @@ package android.hardware { 
    method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback);

    method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback);

    method public final void unlock();

    field public static final java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE";

    field public static final java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO";

    field public static final deprecated java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE";

    field public static final deprecated java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO";

    field public static final int CAMERA_ERROR_EVICTED = 2; // 0x2

    field public static final int CAMERA_ERROR_SERVER_DIED = 100; // 0x64

    field public static final int CAMERA_ERROR_UNKNOWN = 1; // 0x1

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -13603,8 +13603,8 @@ package android.hardware { 
    method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback);

    method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback);

    method public final void unlock();

    field public static final java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE";

    field public static final java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO";

    field public static final deprecated java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE";

    field public static final deprecated java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO";

    field public static final int CAMERA_ERROR_EVICTED = 2; // 0x2

    field public static final int CAMERA_ERROR_SERVER_DIED = 100; // 0x64

    field public static final int CAMERA_ERROR_UNKNOWN = 1; // 0x1

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -13209,8 +13209,8 @@ package android.hardware { 
    method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback);

    method public final void takePicture(android.hardware.Camera.ShutterCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback, android.hardware.Camera.PictureCallback);

    method public final void unlock();

    field public static final java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE";

    field public static final java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO";

    field public static final deprecated java.lang.String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE";

    field public static final deprecated java.lang.String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO";

    field public static final int CAMERA_ERROR_EVICTED = 2; // 0x2

    field public static final int CAMERA_ERROR_SERVER_DIED = 100; // 0x64

    field public static final int CAMERA_ERROR_UNKNOWN = 1; // 0x1

core/java/android/hardware/Camera.java

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.hardware; 
import android.app.ActivityThread;

import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.app.job.JobInfo;

import android.content.Context;

import android.graphics.ImageFormat;

import android.graphics.Point;
@@ -177,19 +178,27 @@ public class Camera { 
    private static final int NO_ERROR = 0;



    /**

     * @deprecated This broadcast is no longer delivered by the system; use

     * {@link android.app.job.JobInfo.Builder JobInfo.Builder}.{@link android.app.job.JobInfo.Builder#addTriggerContentUri}

     * instead.

     * Broadcast Action:  A new picture is taken by the camera, and the entry of

     * the picture has been added to the media store.

     * {@link android.content.Intent#getData} is URI of the picture.

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @Deprecated

    public static final String ACTION_NEW_PICTURE = "android.hardware.action.NEW_PICTURE";



    /**

     * @deprecated This broadcast is no longer delivered by the system; use

     * {@link android.app.job.JobInfo.Builder JobInfo.Builder}.{@link android.app.job.JobInfo.Builder#addTriggerContentUri}

     * instead.

     * Broadcast Action:  A new video is recorded by the camera, and the entry

     * of the video has been added to the media store.

     * {@link android.content.Intent#getData} is URI of the video.

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    @Deprecated

    public static final String ACTION_NEW_VIDEO = "android.hardware.action.NEW_VIDEO";



    /**

services/core/java/com/android/server/am/ActivityManagerService.java

+9 −0
Original line number Diff line number Diff line
@@ -17212,6 +17212,15 @@ public final class ActivityManagerService extends ActivityManagerNative 
                    ProxyInfo proxy = intent.getParcelableExtra(Proxy.EXTRA_PROXY_INFO);

                    mHandler.sendMessage(mHandler.obtainMessage(UPDATE_HTTP_PROXY_MSG, proxy));

                    break;

                case android.hardware.Camera.ACTION_NEW_PICTURE:

                case android.hardware.Camera.ACTION_NEW_VIDEO:

                    // These broadcasts are no longer allowed by the system, since they can

                    // cause significant thrashing at a crictical point (using the camera).

                    // Apps should use JobScehduler to monitor for media provider changes.

                    Slog.w(TAG, action + " no longer allowed; dropping from "

                            + UserHandle.formatUid(callingUid));

                    // Lie; we don't want to crash the app.

                    return ActivityManager.BROADCAST_SUCCESS;

            }

        }