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

Commit 2d2a4515 authored by Vova Sharaienko's avatar Vova Sharaienko Committed by Android (Google) Code Review
Browse files

Merge "[atoms.proto] Refactored apps shared enums files" into main

parents c2360f21 bf139155

core/proto/android/app/appexitinfo.proto

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ option java_multiple_files = true; 
package android.app;



import "frameworks/base/core/proto/android/privacy.proto";

import "frameworks/proto_logging/stats/enums/app/app_enums.proto";

import "frameworks/proto_logging/stats/enums/app_shared/app_enums.proto";



/**

 * An android.app.ApplicationExitInfo object.

core/proto/android/app/appstartinfo.proto

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ option java_multiple_files = true; 
package android.app;



import "frameworks/base/core/proto/android/privacy.proto";

import "frameworks/proto_logging/stats/enums/app/app_enums.proto";

import "frameworks/proto_logging/stats/enums/app_shared/app_enums.proto";



/**

 * An android.app.ApplicationStartInfo object.

core/proto/android/server/activitymanagerservice.proto

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import "frameworks/base/core/proto/android/server/intentresolver.proto"; 
import "frameworks/base/core/proto/android/server/windowmanagerservice.proto";

import "frameworks/base/core/proto/android/util/common.proto";

import "frameworks/base/core/proto/android/privacy.proto";

import "frameworks/proto_logging/stats/enums/app/app_enums.proto";

import "frameworks/proto_logging/stats/enums/app_shared/app_enums.proto";



option java_multiple_files = true;

core/proto/android/server/powermanagerservice.proto

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import "frameworks/base/core/proto/android/os/worksource.proto"; 
import "frameworks/base/core/proto/android/providers/settings.proto";

import "frameworks/base/core/proto/android/server/wirelesschargerdetector.proto";

import "frameworks/base/core/proto/android/privacy.proto";

import "frameworks/proto_logging/stats/enums/app/app_enums.proto";

import "frameworks/proto_logging/stats/enums/app_shared/app_enums.proto";

import "frameworks/proto_logging/stats/enums/os/enums.proto";

import "frameworks/proto_logging/stats/enums/view/enums.proto";