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

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

Merge "Updated proto files names to be built for rust" into main

parents f820527e 92b2acc6

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/enums.proto";

import "frameworks/proto_logging/stats/enums/app/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/enums.proto";

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



/**

 * An android.app.ApplicationStartInfo object.

core/proto/android/os/batterystats.proto

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ package android.os; 


import "frameworks/base/core/proto/android/os/powermanager.proto";

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

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

import "frameworks/proto_logging/stats/enums/app/job/job_enums.proto";

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



message BatteryStatsProto {

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/enums.proto";

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



option java_multiple_files = true;

core/proto/android/server/jobscheduler.proto

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import "frameworks/base/core/proto/android/server/appstatetracker.proto"; 
import "frameworks/base/core/proto/android/server/statlogger.proto";

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

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

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

import "frameworks/proto_logging/stats/enums/app/job/job_enums.proto";

import "frameworks/proto_logging/stats/enums/server/job/enums.proto";



message JobSchedulerServiceDumpProto {