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

Commit 2ec294a4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7135226 from 911519f2 to rvc-qpr3-release 

Change-Id: I7fa37fe888bc532c184e5d6bf0b3476d9167ad01
parents c65dd4b5 911519f2

cmds/statsd/src/atoms.proto

+8 −8
Original line number Diff line number Diff line
@@ -3612,11 +3612,11 @@ message AppStartOccurred { 
    // Empty if not set.

    optional string launch_token = 13;



    // The compiler filter used when when the package was optimized.

    optional int32 package_optimization_compilation_filter = 14;



    // The reason why the package was optimized.

    optional int32 package_optimization_compilation_reason = 15;

    optional int32 package_optimization_compilation_reason = 14;



    // The compiler filter used when when the package was optimized.

    optional int32 package_optimization_compilation_filter = 15;

}



message AppStartCanceled {
@@ -3662,11 +3662,11 @@ message AppStartFullyDrawn { 
    // App startup time (until call to Activity#reportFullyDrawn()).

    optional int64 app_startup_time_millis = 6;



    // The compiler filter used when when the package was optimized.

    optional int32 package_optimization_compilation_filter = 7;



    // The reason why the package was optimized.

    optional int32 package_optimization_compilation_reason = 8;

    optional int32 package_optimization_compilation_reason = 7;



    // The compiler filter used when when the package was optimized.

    optional int32 package_optimization_compilation_filter = 8;

}



/**

core/java/android/os/Process.java

+8 −3
Original line number Diff line number Diff line
@@ -1406,7 +1406,7 @@ public class Process { 
     *

     * @hide

     */

    public static boolean hasFileLocks(int pid) throws IOException {

    public static boolean hasFileLocks(int pid) throws Exception {

        BufferedReader br = null;



        try {
@@ -1418,9 +1418,14 @@ public class Process { 


                for (int i = 0; i < 5 && st.hasMoreTokens(); i++) {

                    String str = st.nextToken();

                    try {

                        if (i == 4 && Integer.parseInt(str) == pid) {

                            return true;

                        }

                    } catch (NumberFormatException nfe) {

                        throw new Exception("Exception parsing /proc/locks at \" "

                                + line +  " \", token #" + i);

                    }

                }

            }

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

+2 −2
Original line number Diff line number Diff line
@@ -1114,7 +1114,7 @@ public final class CachedAppOptimizer { 
                    }

                    return;

                }

            } catch (IOException e) {

            } catch (Exception e) {

                Slog.e(TAG_AM, "Not freezing. Unable to check file locks for " + name + "(" + pid

                        + "): " + e);

                return;
@@ -1192,7 +1192,7 @@ public final class CachedAppOptimizer { 
                        unfreezeAppLocked(proc);

                    }

                }

            } catch (IOException e) {

            } catch (Exception e) {

                Slog.e(TAG_AM, "Unable to check file locks for " + name + "(" + pid + "): " + e);

                synchronized (mAm) {

                    unfreezeAppLocked(proc);