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

565537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yuntao Zhou
538f58916a Fix minor typo in ContentCaptureManager Javadoc 
Noticed on https://developer.android.com/reference/android/view/contentcapture/ContentCaptureManager

Change-Id: I7bb01264947b93e0784497cbad5a5609cb4296d3
 2021-03-11 01:51:21 +00:00
Lucas Lin
d2b8d781f8 Merge "Expose TYPE_VPN_* constants" 2021-03-11 01:30:02 +00:00
Jeff Sharkey
958a1ab393 Merge "Add OWNERS file to AM test helper app" 2021-03-11 01:08:49 +00:00
Jackal Guo
e6d4ca9b8a Merge "Update OWNERS for prebuilt_info" 2021-03-11 00:41:09 +00:00
Chiachang Wang
c506ddca23 Merge "Remove hidden APIs usage regarding to dump" 2021-03-11 00:28:54 +00:00
Chiachang Wang
e7aa80c818 Remove hidden APIs usage regarding to dump 
Classes inside the incoming connectivity module will not be able
to access hidden APIs. The hidden DUMP_FLAG_PRIORITY_* flags
usage should be replaced. It was used to control the dump
priority. DEFAULT priority for services which is treated the
same as NORMAL priority. ConnectivityServiceInitializer took
both NORMAL and HIGH. It trigger different information dumped.
It's replaced with dumpsys that does not send "--dump-priority"
arguments to the service. Thus, design is replaced with
local parsing inside ConnectivitySerivce to provide equivalent
dump.

Bug: 172183305
Test: m ; flash and boot up
Test: adb bugreport ; adb dumpsys connectivity
Change-Id: Ib3c9d8692eb4382cd106734a1a716df6f48ffca4
 2021-03-11 00:28:47 +00:00
Jing Ji
46ab35ec5f Add OWNERS file to AM test helper app 
Test: N/A
Change-Id: I7eafb4e513a1e7216a05c87c5dbf670a1d3ebc13
 2021-03-10 16:08:09 -08:00
Tianjie Xu
5921cd5389 Merge "Log a message if there is no escrow data for RoR" 2021-03-10 23:29:35 +00:00
Kevin Han
a74ea0e480 Merge "Add local service interface for app hibernation" am: 20414370df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624866

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98839b34ff47b373a646edf3a43b48f5d7f69b4d
 2021-03-10 23:17:59 +00:00
Sooraj Sasindran
2f85c69c74 Merge "Update documentation according API review" 2021-03-10 23:13:15 +00:00
Jeff Sharkey
bc1b11029b Merge "Make FileUtils#createDir threadsafe" am: 5232082243 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623101

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6449b55a42994f8c35854bbe698ad2c697ab0244
 2021-03-10 23:06:15 +00:00
Benedict Wong
e57540d009 Merge changes Iad296830,I826711bb,Ieb2a9b20,I6b688b00 am: 03c0059bb1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624741

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77f958e638b209a3b7f6544e02413420983c121b
 2021-03-10 22:51:08 +00:00
Kevin Han
20414370df Merge "Add local service interface for app hibernation" 2021-03-10 22:37:27 +00:00
Jeff Sharkey
5232082243 Merge "Make FileUtils#createDir threadsafe" 2021-03-10 22:02:14 +00:00
Benedict Wong
03c0059bb1 Merge changes Iad296830,I826711bb,Ieb2a9b20,I6b688b00 
* changes:
  Declare VCN exposed networks as NOT_VCN_MANAGED
  Allow underlying cell without unwanted NOT_VCN_MANAGED capability
  Override network and use config IKE session
  Remove usage of hidden Connectivity APIs
 2021-03-10 21:53:01 +00:00
Hall Liu
40a22b24b0 Merge "Add onBindClient for testing" am: 53252b14e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625243

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2f48ba063315842a07972dac2cfce9b01befad4
 2021-03-10 20:14:10 +00:00
Hall Liu
53252b14e5 Merge "Add onBindClient for testing" 2021-03-10 19:24:43 +00:00
Janis Danisevskis
274a93e953 Keystore 2.0: Fix TODOs in public doc comments. 
Bug: 174580379
Test: N/A
Change-Id: If893c408156b2481a22730de22f1a7ba391d88eb
 2021-03-10 11:22:22 -08:00
Benedict Wong
de1f0c3edb Declare VCN exposed networks as NOT_VCN_MANAGED 
This change marks VCN-exposed networks as generic use, NOT_VCN_MANAGED
networks. This is the result of changes to the default NetworkCapability
set, where NOT_VCN_MANAGED was removed from the default capabilities.

Bug: 182212201
Test: atest FrameworksVcnTests
Change-Id: Iad296830201d7317537fac6bea53c79d4e41cae3
 2021-03-10 10:27:23 -08:00
Riddle Hsu
5028f8923a Merge "Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo" am: 90e336819c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f2b8b675e460284ca4489ed4e08fe8695b5d816
 2021-03-10 16:03:28 +00:00