Commit Graph

94282 Commits

Author SHA1 Message Date
Steven Moreland
1c373c4361 Merge "AIDL it! IServiceManager" into stage-aosp-master 2019-07-09 21:49:26 +00:00
Fedor Kudasov
c064c84b5f Return NonNull and other imports
Change-Id: Ia38b13209b45d8228ac02f06663e4dc12be9de60
2019-07-09 14:19:04 +00:00
Fedor Kudasov
8125047183 Merge changes from topic "fix_master_build"
am: 2e5319117a

Change-Id: If49999e7ce6149e847a678b03ccf8b4549f8365b
2019-07-09 06:10:01 -07:00
Fedor Kudasov
2e5319117a Merge changes from topic "fix_master_build"
* changes:
  Revert "Cherry-pick the relevant parts of master change"
  Revert "Remove providesRoutesToMostDestinations."
2019-07-09 09:32:23 +00:00
Fedor Kudasov
559e91e0ef Revert "Cherry-pick the relevant parts of master change"
This reverts commit dd16d44fe8.

Reason for revert: multiple build breakages b/137069068

Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b
2019-07-09 09:29:17 +00:00
Fedor Kudasov
e5cb0a2216 Revert "Remove providesRoutesToMostDestinations."
This reverts commit d85b09a06f.

Reason for revert: multiple build breakages b/137069068

Change-Id: I60a4f71e13fe82f970b177a07c0b58439cbc64ff
2019-07-09 09:23:25 +00:00
Neil Fuller
8d96e17940 Merge "Switch widgets away from android.text.format.Time"
am: db31e6d07a

Change-Id: I550b2c7ac5e3e5b07eda51c190c354e5236a561e
2019-07-09 01:38:01 -07:00
Neil Fuller
db31e6d07a Merge "Switch widgets away from android.text.format.Time" 2019-07-09 08:15:10 +00:00
Chalard Jean
cbaed4e7ba Merge changes Ia43f8811,I7de4f672
am: 3ef04b8e3c

Change-Id: Ifcacd81d343a29b17fdb79f4c8b54c89a293a2b8
2019-07-09 00:56:57 -07:00
Steven Moreland
e17de65051 AIDL it! IServiceManager
Bug: 135768100
Test: boot
Change-Id: I7f8b5d07d4937804e8b0838936f8984ca7d08efa
(cherry picked from commit 7b152971e4)
2019-07-09 01:54:41 +00:00
Chalard Jean
d85b09a06f Remove providesRoutesToMostDestinations.
This function is not used any more.

Test: FrameworksNetTests
Change-Id: Ia43f8811cb9d575e16735b0f4b76d91e7cd42ebc
2019-07-08 20:36:33 +09:00
Chalard Jean
dd16d44fe8 Cherry-pick the relevant parts of master change
I566437e4fe10e1346858149120c50b3c20ca073f to avoid a conflict

Test: atest FrameworksNetTests
Change-Id: I7de4f67234bf97d58bddffa22272c7670398f56d
2019-07-08 20:25:45 +09:00
Nikita Ioffe
f585ed0459 Use ApexInfo.moduleName
See another CL in the topic

Bug: 132428457
Test: builds
Change-Id: I87ba3fb539d0761c515adc8e2d2acc8dfc5e6a9a
Merged-In: If0bd3d368c7373ab0028211a8a4246a9821893af
2019-07-04 15:46:08 +00:00
Nikita Ioffe
b4eee2a17d Rename ApexInfo.package{Name,Path} to module{Name,Path}
This should resolve the confusion between internal name of APEXes that
comes from apex_manifest.json and packageName that comes from
AndroidManifest.xml.

Follow-up CLs:
* Rename package to module for all apexservice binder APIs.
* Rename package to module in apexd codebase.

Test: atest apexservice_test
Test: atest CtsStagedInstallHostTestCases
Bug: 132428457
Change-Id: If0bd3d368c7373ab0028211a8a4246a9821893af
Merged-In: If0bd3d368c7373ab0028211a8a4246a9821893af
(cherry picked from commit ec67395d7d)
2019-07-03 14:27:01 +01:00
Nazanin Bakhshi
1ca89a995b Merge "Add device identifier permission checks to TelephonyPermissions" 2019-07-01 23:26:18 +00:00
Michael Groover
94672cea7c Add device identifier permission checks to TelephonyPermissions
Bug: 131916175
Fixes: 136305129
Test: atest PhoneSubInfoControllerTest
Change-Id: Icca98347ab76b7c3468b95756a33a758a3abde37
Merged-In: I3c82c53ec89cd17b34a61166ccc9e9747388efac
2019-07-01 17:53:11 +00:00
Lorenzo Colitti
736194dfbf Merge "Unit tests for new explicitlySelected behaviour." am: d1379a4a80
am: 10c1a704c0

Change-Id: Id77a5d6a58e7ab4fdaa0b7c15b824270863b83fd
2019-06-29 02:01:55 -07:00
Eugene Susla
2f27997760 [DO NOT MERGE] Guard against launching permission backup/restore twice per request
am: 8c2fb0ea1e

Change-Id: Ibfd0a70b91eb6ae13b8ad6506e02314521c36084
2019-06-28 20:42:01 -07:00
Shuzhen Wang
6f14111467 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev
am: 6da414a8f6

Change-Id: I2ade92a130cc6267a51802633f970d906891d5a6
2019-06-28 17:48:51 -07:00
Eugene Susla
8c2fb0ea1e [DO NOT MERGE] Guard against launching permission backup/restore twice per request
It looks like there is some case where AbstractRemoteService would #run the
same PendingRequest the second time which violates AsyncTask assumption.

Fixes: 135986503
Test: atest android.permission.cts.PermissionControllerTest
Change-Id: I2d072714ee0fad3c365ff7eb191d690056c0931a
2019-06-29 00:20:09 +00:00
TreeHugger Robot
6da414a8f6 Merge "Camera: Clarify manual capture behavior for logical camera" into qt-dev 2019-06-28 23:54:09 +00:00
Mathew Inwood
cd82f9adff Merge "Restore some greylist entries." into qt-dev
am: f4535c8d51

Change-Id: I3851fed60bedab9748f2d6d53f342f2605ecf78b
2019-06-28 13:18:30 -07:00
TreeHugger Robot
f4535c8d51 Merge "Restore some greylist entries." into qt-dev 2019-06-28 20:01:13 +00:00
Andrew Sapperstein
f08f33b97b Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev
am: 9dd0c5628b

Change-Id: Ia58094614151af83aadd36bb04e0389050dd05be
2019-06-28 10:28:00 -07:00
Andrew Sapperstein
9dd0c5628b Merge "Allow granting URI permissions to com.android.settings.module_licenses." into qt-dev 2019-06-28 16:56:04 +00:00
Lorenzo Colitti
b5ad613839 Unit tests for new explicitlySelected behaviour.
ag/7905088 added the ability to pass in acceptUnvalidated without
passing in explicitlySelected. Add unit tests for that code.

While I'm at it, convert a couple of "== 1"s to toBool(), and
update the comments in NetworkAgent.

Bug: 130766237
Test: atest FrameworksNetTests
Change-Id: I6b550bd621e3596975f83464c7b4b8a14269120b
2019-06-28 23:57:22 +09:00
Jorim Jaggi
de8014e068 Merge "GestureNav: Limit exclusion rects" into qt-dev
am: ea3216d462

Change-Id: Id52bcbd80028ce0030b7f8b38058e7a786744497
2019-06-28 07:48:06 -07:00
Mathew Inwood
13ffa87a6d Merge "Restore some greylist entries." into qt-dev
am: f76bdce6e0

Change-Id: I320e33be57b8124ff7c132a67c8981d53802f8f5
2019-06-28 07:43:43 -07:00
Jorim Jaggi
ea3216d462 Merge "GestureNav: Limit exclusion rects" into qt-dev 2019-06-28 13:48:37 +00:00
TreeHugger Robot
f76bdce6e0 Merge "Restore some greylist entries." into qt-dev 2019-06-28 12:02:43 +00:00
Adrian Roos
506267d5f4 GestureNav: Limit exclusion rects
Add limits for system gesture exclusion on the left and right edges.
This prevents non-immersive-sticky apps from totally disabling the
back gesture.

Bug: 135522625
Test: atest SystemGestureExclusionRectsTest

Merged-In: Ib26161663a6aababe803d3c70044f4017bdbe675
Change-Id: Ib26161663a6aababe803d3c70044f4017bdbe675
2019-06-28 17:59:06 +08:00
Mathew Inwood
a5531fa161 Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
  information added

So they are being moved back to the greylist for Q.

Test: Treehugger
Bug: 136102585
Change-Id: Ie3dd15c8e17d530d853473a013717e6175383080
2019-06-28 09:23:06 +00:00
Mathew Inwood
3a75f264a8 Restore some greylist entries.
In Q, these APIs were either:
- removed from the greylist entirely without good reason
- Moved to the restricted greylist without any public alternative
  information added

So they are being moved back to the greylist for Q.

Test: Treehugger
Bug: 136102585
Change-Id: I5ac8b8b9b23c3789d80239cf456072cc7dfa1203
2019-06-28 10:15:37 +01:00
Lorenzo Colitti
e6e57b2c8f Merge "Remove all static members from NetworkStatsFactory." am: 63f94f411b
am: 5409264cee

Change-Id: Iada14a1fea74197014e75a1112c7a5b35d6b1a1d
2019-06-27 19:40:01 -07:00
Lorenzo Colitti
63f94f411b Merge "Remove all static members from NetworkStatsFactory." 2019-06-28 01:59:31 +00:00
David Nelloms
17dccf5418 Merge "Notify on task display change." into qt-dev
am: 22a5e4e5d9

Change-Id: Ia0ae853122ff3acb755abfebb88dda863ee61080
2019-06-27 18:24:54 -07:00
Janis Danisevskis
ecf4d59309 Merge "Gatekeeper generated aidl cpp bindings" 2019-06-28 00:43:10 +00:00
David Nelloms
22a5e4e5d9 Merge "Notify on task display change." into qt-dev 2019-06-28 00:12:49 +00:00
Hai Zhang
6c162a4e36 Merge "Add link to AndroidX Role library in RoleManager documentation." into qt-dev
am: bde371beb6

Change-Id: I846b027bd1970ebc10a1720e5cc601bf633954f6
2019-06-27 17:04:26 -07:00
TreeHugger Robot
bde371beb6 Merge "Add link to AndroidX Role library in RoleManager documentation." into qt-dev 2019-06-27 23:28:54 +00:00
Sergey
d87bdf9834 Merge "Stable seek bar positioning" am: 874b481cdf
am: ffb8583a65

Change-Id: I049976100806ea78d99bad3201945ceccb0ee8c5
2019-06-27 15:40:25 -07:00
Treehugger Robot
874b481cdf Merge "Stable seek bar positioning" 2019-06-27 22:02:06 +00:00
davidln
a06b4b2fa5 Notify on task display change.
This is a targeted fix for not receiving a task stack change callback
when a task with a resumed Activity is reparented to another display.

Bug: 128932906

Test: manual - launch activity from virtual display onto default display
  in a new task, verify callback notified. atest WmTests
Change-Id: Idabad8379cded664bcf302d5c6fb69564d158eb7
Merged-In: Idabad8379cded664bcf302d5c6fb69564d158eb7
2019-06-27 18:54:00 +00:00
Janis Danisevskis
e7a87a9b06 Gatekeeper generated aidl cpp bindings
Moved Gatekeeper aidl definitions to system/core/gatekeeperd.

Test: Manually tested setting PIN.
      android.keystore.cts.CipherTest#testCanCreateAuthBoundKeyWhenScreenLocked
      android.keystore.cts.CipherTest#testKeyguardLockAndUnlock
Change-Id: Ie3583f5682727b1f9a82d270764c94fce33388ec
Merged-In: Ie3583f5682727b1f9a82d270764c94fce33388ec
2019-06-27 11:32:57 -07:00
Shuzhen Wang
da189bddc2 Camera: Clarify manual capture behavior for logical camera
Test: Build and read docs
Bug: 136098496
Change-Id: I4a2e9ac66ef79379b9c50932ddc845f56d7d01b4
2019-06-27 10:29:38 -07:00
Tim Joines
35bc777130 Merge "Disable USAP by default on devices" into qt-dev
am: 6c3bbf9e93

Change-Id: I8195f09066a4288da76a10f5e52d44763034c3af
2019-06-27 09:17:06 -07:00
Tim Joines
6c3bbf9e93 Merge "Disable USAP by default on devices" into qt-dev 2019-06-27 16:01:43 +00:00
Neil Fuller
8a334f433b Merge "Track change of type from short -> int" am: d854e6e0b4
am: 9881c6f3d7

Change-Id: Iab8db7985b5cdd52b22aa2b72e3273c2d8f2f892
2019-06-27 02:43:34 -07:00
Lorenzo Colitti
4aa8760a68 Remove all static members from NetworkStatsFactory.
NetworkStatsFactory is owned by NetworkStatsService, and any
accesses to NSF data should go through NSS.

Test: atest FrameworksNetTests
Change-Id: Idbd0dbbaeb11313f63474e7ec0e01f974349fc89
2019-06-27 17:39:05 +09:00
Lorenzo Colitti
cf545aa02a Merge "Transfer ownership of NetworkStatsFactory to NetworkStatsService." am: bd94f0afd2
am: 92292f556b

Change-Id: If897c9c95fc8571949183c45a99a5c28cb032ebb
2019-06-27 01:31:46 -07:00