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

Commit 9756d738 authored by Wenhao Wang's avatar Wenhao Wang Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Revert "User consent for Logcat data access""""

parents 549ffa2e 761d4a0c

core/java/android/app/ActivityManagerInternal.java

+0 −8
Original line number Diff line number Diff line
@@ -214,14 +214,6 @@ public abstract class ActivityManagerInternal { 
     */

    public abstract boolean isSystemReady();



    /**

     * Returns package name given pid.

     *

     * @param pid The pid we are searching package name for.

     */

    @Nullable

    public abstract String getPackageNameByPid(int pid);



    /**

     * Sets if the given pid has an overlay UI or not.

     *

core/java/android/os/logcat/ILogcatManagerService.aidl

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,5 @@ package android.os.logcat; 
interface ILogcatManagerService {

    void startThread(in int uid, in int gid, in int pid, in int fd);

    void finishThread(in int uid, in int gid, in int pid, in int fd);

    void approve(in int uid, in int gid, in int pid, in int fd);

    void decline(in int uid, in int gid, in int pid, in int fd);

}

core/res/AndroidManifest.xml

+0 −8
Original line number Diff line number Diff line
@@ -6616,14 +6616,6 @@ 
                  android:exported="false">

        </activity>



        <activity android:name="com.android.server.logcat.LogAccessConfirmationActivity"

                  android:theme="@style/Theme.Dialog.Confirmation"

                  android:excludeFromRecents="true"

                  android:process=":ui"

                  android:label="@string/log_access_confirmation_title"

                  android:exported="false">

        </activity>



        <activity android:name="com.android.server.notification.NASLearnMoreActivity"

                  android:theme="@style/Theme.Dialog.Confirmation"

                  android:excludeFromRecents="true"

core/res/res/values/strings.xml

+0 −14
Original line number Diff line number Diff line
@@ -5719,20 +5719,6 @@ 
    <!-- Title for the harmful app warning dialog. [CHAR LIMIT=40] -->

    <string name="harmful_app_warning_title">Harmful app detected</string>



    <!-- Title for the log access confirmation dialog. [CHAR LIMIT=40] -->

    <string name="log_access_confirmation_title">System log access request</string>

    <!-- Label for the allow button on the log access confirmation dialog. [CHAR LIMIT=20] -->

    <string name="log_access_confirmation_allow">Only this time</string>

    <!-- Label for the deny button on the log access confirmation dialog. [CHAR LIMIT=20] -->

    <string name="log_access_confirmation_deny">Don\u2019t allow</string>



    <!-- Content for the log access confirmation dialog. [CHAR LIMIT=NONE]-->

    <string name="log_access_confirmation_body"><xliff:g id="log_access_app_name" example="Example App">%s</xliff:g> requests system logs for functional debugging.

        These logs might contain information that apps and services on your device have written.</string>



    <!-- Privacy notice do not show [CHAR LIMIT=20] -->

    <string name="log_access_do_not_show_again">Don\u2019t show again</string>



    <!-- Text describing a permission request for one app to show another app's

         slices [CHAR LIMIT=NONE] -->

    <string name="slices_permission_request"><xliff:g id="app" example="Example App">%1$s</xliff:g> wants to show <xliff:g id="app_2" example="Other Example App">%2$s</xliff:g> slices</string>

core/res/res/values/symbols.xml

+0 −5
Original line number Diff line number Diff line
@@ -3868,11 +3868,6 @@ 
  <java-symbol type="string" name="harmful_app_warning_title" />

  <java-symbol type="layout" name="harmful_app_warning_dialog" />



  <java-symbol type="string" name="log_access_confirmation_allow" />

  <java-symbol type="string" name="log_access_confirmation_deny" />

  <java-symbol type="string" name="log_access_confirmation_title" />

  <java-symbol type="string" name="log_access_confirmation_body" />



  <java-symbol type="string" name="config_defaultAssistantAccessComponent" />



  <java-symbol type="string" name="slices_permission_request" />