Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
565,564 Commits 3 Branches 0 Tags
f593e71276dc90d7961bfb0e35c6c7bda68784d2
Commit Graph

565564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tianjie Xu
f593e71276 Merge "Extend the metrics for resume on reboot" am: 1c5faf6141 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556763

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I833356a154218a3e2c914efd4b2a6242e37a26c6
 2021-03-11 22:18:39 +00:00
Tianjie Xu
1c5faf6141 Merge "Extend the metrics for resume on reboot" 2021-03-11 22:13:25 +00:00
Tyler Gunn
346a19a3ce Merge "Mark android.net.sip code as deprecated." am: 3b36aa32fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d84a4fbaaf910ca3c0420229f67e282cf258f74
 2021-03-11 22:07:55 +00:00
Tyler Gunn
3b36aa32fa Merge "Mark android.net.sip code as deprecated." 2021-03-11 22:03:11 +00:00
Kevin Han
fe54088dcb Merge "Fix local service binding in tests." am: 6d0bf150e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb43aae6f11a26f6d1d1937ab99880b3da19e352
 2021-03-11 22:00:03 +00:00
Kevin Han
6d0bf150e3 Merge "Fix local service binding in tests." 2021-03-11 21:10:43 +00:00
Daniel Bright
bb58b8a819 Merge "Update comments on onApnUnthrottled" am: 1bec754c8b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4de8a5e489211dcaa469608a04ac07d70afb7391
 2021-03-11 18:29:33 +00:00
Daniel Bright
1bec754c8b Merge "Update comments on onApnUnthrottled" 2021-03-11 18:02:36 +00:00
Neil Fuller
288f5630c1 Merge "Add MetricsTimeZoneSuggestion for metrics use" am: c06b300638 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6166e51e6c323c6f0ae46a0515189468ce897ba6
 2021-03-11 17:46:17 +00:00
Neil Fuller
6ca6f593a1 Merge "OWNERS change / new .proto file" am: 6d3fb3d57c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628819

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cbee2d8c4938aca3045f22c61c03b9961faac7a
 2021-03-11 17:43:27 +00:00
Neil Fuller
c06b300638 Merge "Add MetricsTimeZoneSuggestion for metrics use" 2021-03-11 17:38:30 +00:00
James Mattis
987d246395 Merge "Add auto-postsubmit test tag for frameworks/base" am: ec14bafb25 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626462

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica56ddfb4e4320ab5e553856b9ef3abf88add266
 2021-03-11 17:33:52 +00:00
Neil Fuller
6d3fb3d57c Merge "OWNERS change / new .proto file" 2021-03-11 17:12:18 +00:00
James Mattis
ec14bafb25 Merge "Add auto-postsubmit test tag for frameworks/base" 2021-03-11 17:05:34 +00:00
Janis Danisevskis
8b7ca71fd7 Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" am: 5de808c5e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624871

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ccf99568c8238256addc02982a9b63757a7a22e
 2021-03-11 16:18:12 +00:00
Janis Danisevskis
5de808c5e2 Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" 2021-03-11 15:50:32 +00:00
Neil Fuller
b2973f8213 Add MetricsTimeZoneSuggestion for metrics use 
This tracks an internal change.

Bug: 172934905
Test: build / boot / treehugger
Change-Id: I94ab695250cc7d0db294628f9578f3ffa77b998d
 2021-03-11 14:34:33 +00:00
Neil Fuller
c3c171cbe5 OWNERS change / new .proto file 
Splitting out GeolocationTimeZoneSuggestionProto to
time_zone_detector.proto.

Test: build only
Bug: 172934905
Change-Id: Ib7798955ae7ab3a486aa33d2bed85f4bbd8511e1
 2021-03-11 14:28:59 +00:00
Lorenzo Colitti
c147019ab2 Merge "Don't start clatd if disabled by vendor property." am: a517079da0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e468f41424104a5e1d757e18bc5a8648c7f6d1d
 2021-03-11 12:34:57 +00:00
Lorenzo Colitti
a517079da0 Merge "Don't start clatd if disabled by vendor property." 2021-03-11 12:22:34 +00:00
Rafal Slawik
19bc7824dc Merge "Add missing AMC reviewers" am: 7bc8d20b51 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1580524761450742935c6de8ed420b2b36afa95
 2021-03-11 12:16:25 +00:00
Rafal Slawik
7bc8d20b51 Merge "Add missing AMC reviewers" 2021-03-11 11:54:35 +00:00
Treehugger Robot
2172f58763 Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance" am: 721f75ec5a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623080

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iecd39adff2f110571e618b679ab60a571e2237a6
 2021-03-11 11:40:37 +00:00
Yo Chiang
6fe70ef0c1 Merge "Ignore InterruptedException from Thread.sleep()" am: ffdc8928ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541644

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3b6c12f0aa70cf9fe0c5ca84803b24a22cb5982
 2021-03-11 11:37:09 +00:00
Treehugger Robot
721f75ec5a Merge "Keystore 2.0: Rename KeystoreUserManagement KeystoreMaintenance" 2021-03-11 11:20:11 +00:00
Yo Chiang
ffdc8928ac Merge "Ignore InterruptedException from Thread.sleep()" 2021-03-11 10:58:38 +00:00
Rafal Slawik
13c2ee55f7 Add missing AMC reviewers 
Ensure that everyone from AMC rotation can approve platform changes.

Bug: 182373120
Test: n/a
Change-Id: I074fcd2b8635e930e16f20e59e4683d27ecdd519
 2021-03-11 10:02:38 +00:00
Yo Chiang
d110e02fad Ignore InterruptedException from Thread.sleep() 
It's probably harmless that Thread.sleep() is interrupted, so ignore the
error.

Bug: 165471299
Test: None
Change-Id: I86e07fe82875172c84f96176b4368ead7b60d09d
 2021-03-11 08:44:03 +00:00
Lorenzo Colitti
4fe7f5bf8b Merge "Unbreak extraInfo values returned to apps." am: 78cf2f60e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624040

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6560b94331f477cd7ea9df3c8f766b1eec49dfa
 2021-03-11 08:26:47 +00:00
Lorenzo Colitti
78cf2f60e5 Merge "Unbreak extraInfo values returned to apps." 2021-03-11 08:06:03 +00:00
Janis Danisevskis
a1d687e0e5 Merge "Modify AttestationUtils to use public Keystore API" am: 7a46c3c1fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622922

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6505041a28e1aa2d1fa9bb6e64508b7090a67777
 2021-03-11 06:53:38 +00:00
James Lin
98eb9af014 Merge "Update the RCS UCE APIs." am: 6c165b2da9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620862

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f8c85066e7636c78bd06f97e2a88a2167fe8f33
 2021-03-11 06:50:55 +00:00
Janis Danisevskis
7a46c3c1fd Merge "Modify AttestationUtils to use public Keystore API" 2021-03-11 06:47:41 +00:00
Janis Danisevskis
f81dbc08ea Merge "Keystore 2.0: Fix TODOs in public doc comments." am: 12ddcc8874 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626281

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7690d600faa4677b4565107c060958eb882be23
 2021-03-11 06:45:22 +00:00
James Lin
6c165b2da9 Merge "Update the RCS UCE APIs." 2021-03-11 06:28:00 +00:00
Janis Danisevskis
12ddcc8874 Merge "Keystore 2.0: Fix TODOs in public doc comments." 2021-03-11 06:19:34 +00:00
Lorenzo Colitti
55c89d19f8 Merge "Set extraInfo on cellular TestNetworkAgents." am: f0f69b46e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66af2cf6b6cd286993fa3328c5cc52d8bba3beb9
 2021-03-11 03:57:11 +00:00
Lorenzo Colitti
f0f69b46e2 Merge "Set extraInfo on cellular TestNetworkAgents." 2021-03-11 03:31:49 +00:00
Ady Abraham
8ec1bd694d Merge "Update test expectations with changed names of D8 synthetics" am: d14c779c66 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624423

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b7dea7acb62508ca02879c0ef661b5b5409ff12
 2021-03-11 02:42:50 +00:00
Ady Abraham
d14c779c66 Merge "Update test expectations with changed names of D8 synthetics" 2021-03-11 02:26:37 +00:00
Aaron Huang
7ed2eb0997 Merge "Remove IBatteryStats from ConnectivityService module" am: a06c417b0f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623262

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb2e02126cfaf13360e23e43f6f15a8a8254121a
 2021-03-11 02:17:59 +00:00
Yuntao Zhou
3ffbb1f042 Merge "Fix minor typo in ContentCaptureManager Javadoc" am: 6305e68c6e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619880

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52def25c5f09fde078e6317a254fbe323f4598a5
 2021-03-11 02:14:36 +00:00
Lucas Lin
1fd78110a4 Merge "Expose TYPE_VPN_* constants" am: d2b8d781f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625559

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02bdba628c0d1ef2dbf82dcc5b4f7f09a2ea7eb7
 2021-03-11 02:09:53 +00:00
Jeff Sharkey
b59b8b0040 Merge "Add OWNERS file to AM test helper app" am: 958a1ab393 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1627139

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibbfdf1d8d7adbd15c0f0a0cf96376dce143645bf
 2021-03-11 02:09:01 +00:00
Jackal Guo
95bac603ac Merge "Update OWNERS for prebuilt_info" am: e6d4ca9b8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7addfd1ee26d00269e58aa7c8dcc224e7b87057
 2021-03-11 02:06:51 +00:00
Aaron Huang
a06c417b0f Merge "Remove IBatteryStats from ConnectivityService module" 2021-03-11 02:04:41 +00:00
Chiachang Wang
93c4200630 Merge "Remove hidden APIs usage regarding to dump" am: c506ddca23 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95aa9931607301a61dfee801de32242f75528d0b
 2021-03-11 02:03:11 +00:00
Tianjie Xu
6ff635ee48 Merge "Log a message if there is no escrow data for RoR" am: 5921cd5389 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625501

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaad303eea83fcbcc27144432b883cb9d20a4a867
 2021-03-11 01:58:50 +00:00
Sooraj Sasindran
2cb338dbc0 Merge "Update documentation according API review" am: 2f85c69c74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619810

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cb513413bf75ac73acc46c249c5e9d06456c65c
 2021-03-11 01:52:51 +00:00
Yuntao Zhou
6305e68c6e Merge "Fix minor typo in ContentCaptureManager Javadoc" 2021-03-11 01:51:47 +00:00