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

Commit 9d06f574 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Move FGS while-in-use log message." into sc-dev am: ac769c4d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14709457

Change-Id: Id10cfae4b620ea00490736d0b2beb079d929cf26
parents d1fd3c16 ac769c4d

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

+8 −8
Original line number Original line Diff line number Diff line
@@ -1706,14 +1706,6 @@ public final class ActiveServices { 
                        +  String.format("0x%08X", manifestType)

                        +  String.format("0x%08X", manifestType)

                        + " in service element of manifest file");

                        + " in service element of manifest file");

                }

                }

                // If the foreground service is not started from TOP process, do not allow it to

                // have while-in-use location/camera/microphone access.

                if (!r.mAllowWhileInUsePermissionInFgs) {

                    Slog.w(TAG,

                            "Foreground service started from background can not have "

                                    + "location/camera/microphone access: service "

                                    + r.shortInstanceName);

                }

            }

            }





            boolean alreadyStartedOp = false;

            boolean alreadyStartedOp = false;
@@ -1802,6 +1794,14 @@ public final class ActiveServices { 
                                    r.appInfo.uid, r.intent.getIntent(), r, r.userId,false);

                                    r.appInfo.uid, r.intent.getIntent(), r, r.userId,false);

                        }

                        }

                    }

                    }

                    // If the foreground service is not started from TOP process, do not allow it to

                    // have while-in-use location/camera/microphone access.

                    if (!r.mAllowWhileInUsePermissionInFgs) {

                        Slog.w(TAG,

                                "Foreground service started from background can not have "

                                        + "location/camera/microphone access: service "

                                        + r.shortInstanceName);

                    }

                    logFgsBackgroundStart(r);

                    logFgsBackgroundStart(r);

                    if (r.mAllowStartForeground == REASON_DENIED && isBgFgsRestrictionEnabled(r)) {

                    if (r.mAllowStartForeground == REASON_DENIED && isBgFgsRestrictionEnabled(r)) {

                        final String msg = "Service.startForeground() not allowed due to "

                        final String msg = "Service.startForeground() not allowed due to "