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

565522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
James Mattis
6f901df16a Merge "frameworks: add test group for auto tests" am: a4e69024bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7027594488771b408db82639fc6703c42beef186
 2021-03-10 15:58:44 +00:00
Sooraj Sasindran
60310d719e Update documentation according API review 
Bug: 174580495, 174580077
Change-Id: I2791eb1351057a55caa99e9e1b95d26a31d708f2
Test: build
 2021-03-10 15:15:19 +00:00
Riddle Hsu
90e336819c Merge "Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo" 2021-03-10 15:13:14 +00:00
James Mattis
a4e69024bb Merge "frameworks: add test group for auto tests" 2021-03-10 15:12:49 +00:00
Lorenzo Colitti
e93309bff7 Set extraInfo on cellular TestNetworkAgents. 
This makes the test more realistic, since telephony always puts
the APN name in the extraInfo field. It also makes it easy to
test that various APIs properly return the extra info without
plumbing a new parameter through TestNetworkAgentWrapper,
NetworkAgentWrapper, and InstrumentedNetworkAgent.

Also make the extraInfo and the legacyType available to tests.
This will be used in future tests that assert the contents of
extraInfo.

Bug: 181855958
Test: test-only change
Change-Id: If4eddb6cd9e70bb33e10d72aceebaea843244246
 2021-03-10 23:33:08 +09:00
Jackal Guo
91a252e974 Update OWNERS for prebuilt_info 
Align OWNERS with prebuilt file and info.

Test: Treehugger
Change-Id: I41768ce1131bfa89483a416a74f3da53310a1f05
 2021-03-10 20:57:29 +08:00
Rubin Xu
ffa9add6c5 Merge "Add locksettings unit tests to presubmit" am: 643fb23a74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621161

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I439a050bdbf86651193eccc015c19b48754b69a0
 2021-03-10 11:51:16 +00:00
Rubin Xu
643fb23a74 Merge "Add locksettings unit tests to presubmit" 2021-03-10 11:05:50 +00:00
lucaslin
62b2252831 Expose TYPE_VPN_* constants 
Expose TYPE_VPN_* constants so that connectivity mainline module
can access them.

Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: Ic8d46a392f3deda5983c52b43585707fa2c98f57
 2021-03-10 16:57:57 +08:00
weihua.li
af6f90bbf1 Fix worng value of 'TOTAL of Rss Total' when dumpsys meminfo 
Use memInfo.getTotalRss instead of memInfo.getTotalPss
to get the value of 'TOTAL of Rss Total'.

bug 182328162

Signed-off-by: weihua.li <weihua.li@unisoc.com>
Change-Id: I5487abe4870e10f4ee79c86c0ad0e75a3843deb1
 2021-03-10 13:56:35 +08:00
Tianjie
0ab007e112 Log a message if there is no escrow data for RoR 
Bug: 181957098
Test: reboot, check the message is logged
Change-Id: If531931f1da106dd553e44d82bc595eaf875b195
 2021-03-09 21:52:55 -08:00
Hall Liu
eb7c9eaf16 Add onBindClient for testing 
Add an overrideable method in ConnectionService that gets called when
telecom binds, since onBind is final and it's unsafe to make not-final.

Bug: 181057509
Test: atest CtsTelecomTestCases
Change-Id: I80088185402789fec499b8659ca8b74bcec05748
 2021-03-09 20:29:40 -08:00