Commit Graph

106642 Commits

Author SHA1 Message Date
Steven Moreland
15acebb039 Merge changes from topic "wait-for-aidl" into stage-aosp-master am: d6b5bdf07d am: 4955049ace am: 11912440c5
am: fac32905f9

Change-Id: I52ad863baa35828408b61a7f2ec1d7fb4f67c121
2019-08-30 12:08:45 -07:00
TreeHugger Robot
8e6a69c3a2 Merge "Allow apps to collect which appops were noted" 2019-08-30 18:53:22 +00:00
Jeff Sharkey
80cdd27194 Merge "Ignore broken tests, fix flaky tests." 2019-08-30 18:53:09 +00:00
Steven Moreland
fac32905f9 Merge changes from topic "wait-for-aidl" into stage-aosp-master am: d6b5bdf07d am: 4955049ace
am: 11912440c5

Change-Id: I9997004285d1299742c50b222edf9301be09fc98
2019-08-30 11:48:29 -07:00
Steven Moreland
11912440c5 Merge changes from topic "wait-for-aidl" into stage-aosp-master am: d6b5bdf07d
am: 4955049ace

Change-Id: If720ddc218387369966a28f1c21c6f94ed75a74a
2019-08-30 11:31:23 -07:00
Steven Moreland
4955049ace Merge changes from topic "wait-for-aidl" into stage-aosp-master
am: d6b5bdf07d

Change-Id: Icf56545cd7f046d59841921a35f715e5b5812357
2019-08-30 11:18:26 -07:00
Mady Mellor
8c209679f5 Merge "qt-r1-bubbles-dev @ build 5835883" 2019-08-30 18:11:37 +00:00
Steven Moreland
d6b5bdf07d Merge changes from topic "wait-for-aidl" into stage-aosp-master
* changes:
  PowerManagerService: use waitForService.
  ServiceManagerProxy: add APIs.
2019-08-30 17:54:37 +00:00
Sarah Chin
5741927f2b Merge "Handle 5G meteredness in telephony framework" 2019-08-30 17:41:18 +00:00
Aurimas Liutikas
488d37b2d0 Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be am: ed5beec21b
am: de0ebb082e

Change-Id: I60c55b6706e8d43121e8b2c7a35efff38668f66b
2019-08-30 08:54:38 -07:00
Aurimas Liutikas
de0ebb082e Merge "Add missing nullability annotations." into stage-aosp-master am: 85c0a5a2be
am: ed5beec21b

Change-Id: I202951d51820be47b9195734601830553215bdd7
2019-08-30 08:43:01 -07:00
Aurimas Liutikas
ed5beec21b Merge "Add missing nullability annotations." into stage-aosp-master
am: 85c0a5a2be

Change-Id: Ic9ea2b9840fbb678bbb6ab77038415581feba918
2019-08-30 08:35:52 -07:00
Aurimas Liutikas
85c0a5a2be Merge "Add missing nullability annotations." into stage-aosp-master 2019-08-30 15:19:45 +00:00
Philip P. Moltmann
2b08aafc14 Allow apps to collect which appops were noted
If private user data is send to an app the data provider should note an
app-op. This change adds a new API AppOpsManager#setNotedAppOpsCollector
that allows an app to get notified every time such an private data access
happens.

This will allow apps to monitor their own private data usage. Esp. with
big, old apps, distributed teams or 3rd party libraries it might not always
be clear what subsystems access private data.

There are three different situations how private data can be accessed and
an app op is noted:

1. Private data access inside a two-way binder call.
E.g. LocationManager#getLastKnownLocation. When we start a two way
binder transaction, we remember the calling uid via
AppOpsManager#collectNotedAppOps. Then when the data providing code
calls AppOpsManager#noteOp->AppOpsManager#markAppOpNoted the noted
app-op is remembered in
AppOpsManager#sAppOpsNotedInThisBinderTransaction. Then when returning
from the binder call, we add the list of noted app-ops to the
reply-parcel via AppOpsManager#prefixParcelWithAppOpsIfNeeded. On the
calling side we check if there were any app-ops noted in
AppOpsManager#readAndLogNotedAppops and then call the collector while
still in the binder code. This allows the collector e.g. collect a stack
trace which can be used to figure out what app code caused the
private data access.

2. Very complex apps might do permissions checks internal to themself.
I.e. an app notes an op for itself. We detect this case in
AppOpsManager#markAppOpNoted and immediately call the collector similar
to case (1).

3. Sometimes private data is accessed outside of a two-way binder call.
E.g. if an app registers a LocationListener an app-op is noted each time
a new location is send to the app. In this case it is not clear to the
framework which app-action triggered this app-op-note. Hence the data
provider has to describe in a AsyncNotedAppOp object when an why the
access happened. These objects are then send to the system server via
IAppOpsService#noteAsyncOp and then the collector in the app. There are
rare cases where a private data access happens before the app is running
(e.g. when a geo-fence is triggered). In this case we cache a small
amount of AsyncNotedAppOps (in AppOpsService#mUnforwardedAsyncNotedOps)
and deliver them when the app is ready for these events (in
AppOpsManager#setNotedAppOpsCollector).

Test: atest CtsAppOpsTestCases (includes new tests covering this
                                functionality)
Bug: 136505050
Change-Id: I96ded4a8d8d9bcb37a4555d9b1281cb57945ffa9
2019-08-30 08:18:50 -07:00
Aurimas Liutikas
34c56bcf4a Merge "Add missing nullability annotations." 2019-08-30 15:14:37 +00:00
Sarah Chin
92860a704b Handle 5G meteredness in telephony framework
Carriers can set override values via SubscriptionManager.
Added constants and configs for 5G meteredness updates.

Bug: 139070884
Bug: 139218397
Test: atest FrameworksTelephonyTests
Test: atest
cts/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java

Change-Id: Ic8c5938c4a414ce63303a1fa25af60a0082b1ba9
2019-08-30 14:27:39 +00:00
Remi NGUYEN VAN
be354592f0 Merge "Run callbacks on ConnectivityService thread" am: bef5d2165d am: 5af10311a3 am: 6f757cc4a1 am: 5020c0b69e
am: 99ad4a5368

Change-Id: I382db90c318495244a42a2d4af6e5ebf54f05750
2019-08-30 04:17:08 -07:00
Remi NGUYEN VAN
99ad4a5368 Merge "Run callbacks on ConnectivityService thread" am: bef5d2165d am: 5af10311a3 am: 6f757cc4a1
am: 5020c0b69e

Change-Id: I8ada7ccf94e0ade83c0d810daba9703da60a6f59
2019-08-30 04:05:18 -07:00
Remi NGUYEN VAN
5020c0b69e Merge "Run callbacks on ConnectivityService thread" am: bef5d2165d am: 5af10311a3
am: 6f757cc4a1

Change-Id: I12d7b8fca85502807288bba03417f2ceb0c9f533
2019-08-30 03:53:46 -07:00
Remi NGUYEN VAN
6f757cc4a1 Merge "Run callbacks on ConnectivityService thread" am: bef5d2165d
am: 5af10311a3

Change-Id: I288994ccfdd044453aa818681745b8e69881264a
2019-08-30 03:47:09 -07:00
Remi NGUYEN VAN
5af10311a3 Merge "Run callbacks on ConnectivityService thread"
am: bef5d2165d

Change-Id: I7a8d035ec7453c5351eb2646c631c19964cb0f88
2019-08-30 03:36:26 -07:00
Treehugger Robot
bef5d2165d Merge "Run callbacks on ConnectivityService thread" 2019-08-30 10:18:28 +00:00
Jiyong Park
1cacde5b54 Merge changes from topic "drop_circular_dep" into stage-aosp-master am: 70fb81076e am: ec493198bb
am: 412126eedd

Change-Id: If3427de3d3d1d5c1561d93cf9e136bd6ba48d651
2019-08-29 23:32:12 -07:00
Jiyong Park
412126eedd Merge changes from topic "drop_circular_dep" into stage-aosp-master am: 70fb81076e
am: ec493198bb

Change-Id: If5f97064a3a3a440b2badc18a0d7d4ac92265407
2019-08-29 23:25:55 -07:00
Jiyong Park
ec493198bb Merge changes from topic "drop_circular_dep" into stage-aosp-master
am: 70fb81076e

Change-Id: Ib48b82ef05adb574d64a8c749a5ddcce1eabe047
2019-08-29 23:11:43 -07:00
Jiyong Park
70fb81076e Merge changes from topic "drop_circular_dep" into stage-aosp-master
* changes:
  Cut the dependency to framework from droiddoc modules
  Remove -without-aidls filegroups for the media apex.
2019-08-30 05:14:21 +00:00
Jiyong Park
5366ea2089 Cut the dependency to framework from droiddoc modules
droiddoc modules for the SDK API documentation and stubs library
generations have depended on the 'framework' (which was recently changed
to framework-minus-apex' module to get the list of Java source files to
be processed.

This however caused a circular dependency when we tried to modularize
some classes in the framework library as a separate library. The
separate java library depended on the stubs library (because it should
only use SDK APIs) and the stubs library depended on the framework
library. The framework library itself depended on the separated library
(or its stub) to use APIs from the separated library, thus forming a
circular dependency.

This change fixes the problem by directly giving the framework source
files via a filegroup `framework-sources-to-document` where all Java
and AIDL files that are to be documented are included in.

This change also put the generated R.java and Manifest.java files from
framework-res into the filegroup for framework sources.

Bug: 70046217
Bug: 135922046
Test: m

Exempt-From-Owner-Approval: Approved internally
Merged-In: I09ad88da47540d31ad089aad5e1151a4b6877ec2
(cherry picked from commit 20426538f8)
Change-Id: I09ad88da47540d31ad089aad5e1151a4b6877ec2
2019-08-30 05:14:08 +00:00
Mady Mellor
06b770cf14 qt-r1-bubbles-dev @ build 5835883
Test: presubmit setup on source branch

Bug: 126945401
Bug: 128932906
Bug: 129158983
Bug: 130237686
Bug: 130250809
Bug: 130442248
Bug: 131267438
Bug: 131609280
Bug: 131692350
Bug: 131849856
Bug: 133444037
Bug: 134064116
Bug: 134064858
Bug: 134070807
Bug: 134077101
Bug: 134090085
Bug: 134155107
Bug: 134423445
Bug: 134512898
Bug: 134514210
Bug: 134514227
Bug: 134734945
Bug: 134960381
Bug: 134989736
Bug: 135214687
Bug: 135280077
Bug: 135472021
Bug: 135475155
Bug: 135487618
Bug: 135488406
Bug: 135518045
Bug: 135633218
Bug: 136034310
Bug: 136150954
Bug: 136199542
Bug: 136538998
Bug: 137201711
Bug: 137213469
Bug: 137214359
Bug: 137214536
Bug: 137233453
Bug: 137876221
Bug: 138301618
Bug: 138445026
Bug: 138659213
Bug: 138749133
Bug: 138799651
Bug: 138801505
Bug: 138941969
Bug: 139002444
Bug: 139025304
Bug: 139816141
Change-Id: Ic271a6a0f0803941dd5a84124dabf4d8c5fcc755
2019-08-29 20:24:52 -07:00
TreeHugger Robot
7ce605ebe9 Merge "Updated onSharedPreferenceChanged listener behavior." 2019-08-30 03:10:08 +00:00
Kevin Hufnagle
c279bcff22 Merge "docs: Improved tick/click effect descriptions" into qt-dev am: a7496671da am: 40a40c73d7 am: 13a441d648
am: 9426bb197e

Change-Id: I0836ec3671ae306796a1f3f58b1eefd9b3537cfe
2019-08-29 19:25:03 -07:00
Kevin Hufnagle
9426bb197e Merge "docs: Improved tick/click effect descriptions" into qt-dev am: a7496671da am: 40a40c73d7
am: 13a441d648

Change-Id: I6a6521d4c67013e1f0cc5a10698105a4c55eb145
2019-08-29 19:10:49 -07:00
Kevin Hufnagle
13a441d648 Merge "docs: Improved tick/click effect descriptions" into qt-dev am: a7496671da
am: 40a40c73d7

Change-Id: I4227eebb2a74fbcecdc15dff56d26bdbbbaca027
2019-08-29 19:00:15 -07:00
Kevin Hufnagle
bef7378fd6 Merge "docs: Improved tick/click effect descriptions" into qt-dev am: a7496671da
am: 40a40c73d7

Change-Id: I4b5ca0ab5e278c9d465f6386cfc1c173233597af
2019-08-29 19:00:07 -07:00
Kevin Hufnagle
6bf8f080a1 Merge "docs: Improved tick/click effect descriptions" into qt-dev
am: a7496671da

Change-Id: Id733bdd016dc496ea14762cc48e15e9ae38a1d51
2019-08-29 18:54:25 -07:00
Kevin Hufnagle
40a40c73d7 Merge "docs: Improved tick/click effect descriptions" into qt-dev
am: a7496671da

Change-Id: Id33aa9b90e3a62751a9fa7a4074a44737d7a95e3
2019-08-29 18:52:02 -07:00
Aurimas Liutikas
4d1699da48 Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-29 17:15:44 -07:00
Aurimas Liutikas
00be951a08 Add missing nullability annotations.
To prepare for enabling MissingNullability Metalava check this CL
works on adding missing nullability issues that metalava flags if
we tell it to flag new things since API 29.

This is not a complete CL, mostly addresses public api and
toString/equals for @SystemApi

Exempt-From-Owner-Approval: Large scale nullability clean up
Bug: 124515653
Test: make -j checkapi
Merged-In: I109260842cfc25f06e40694997fcbb4afa02c867
Change-Id: I109260842cfc25f06e40694997fcbb4afa02c867
2019-08-30 00:14:44 +00:00
TreeHugger Robot
37f7faebf3 Merge "Update CollectionInfo comment to indicate -1 is ambiguous count." 2019-08-29 23:19:50 +00:00
Mathieu Chartier
6c0c2ad9c0 Merge "Clean up class preloading" am: 4082bc010b am: 5b2da73fa3 am: 8a3781df49 am: 47313fedf1
am: 4d7a214df6

Change-Id: I7411cf45dafe63525df871ba7052aa1540a4d951
2019-08-29 16:18:49 -07:00
Mathieu Chartier
4d7a214df6 Merge "Clean up class preloading" am: 4082bc010b am: 5b2da73fa3 am: 8a3781df49
am: 47313fedf1

Change-Id: I8c0795592ebc008a63cdef02194c76c19be9fb53
2019-08-29 15:59:28 -07:00
Ian Kasprzak
0a7dd8e87a Merge "[DO NOT MERGE] Cleanup TEST_MAPPING disables from ag/9285495" into stage-aosp-master 2019-08-29 22:57:37 +00:00
Mathieu Chartier
47313fedf1 Merge "Clean up class preloading" am: 4082bc010b am: 5b2da73fa3
am: 8a3781df49

Change-Id: I925808dc2e79b928692833b22d6d8667cff748dc
2019-08-29 15:40:58 -07:00
Mathieu Chartier
8a3781df49 Merge "Clean up class preloading" am: 4082bc010b
am: 5b2da73fa3

Change-Id: Ia1083bfc351ed2f93ae3bda4724d35f806f98d59
2019-08-29 15:33:34 -07:00
Mathieu Chartier
5b2da73fa3 Merge "Clean up class preloading"
am: 4082bc010b

Change-Id: I719d2a223a1ab17aed832b618e26091cb3e368e8
2019-08-29 15:23:26 -07:00
Steven Moreland
3ffad04add ServiceManagerProxy: add APIs.
This class is hanging around for UnsupportedApiUsage. Adding additional
APIs here which do nothing in order to satisfy the inherited interface.

Bug: 136027762
Test: compile :)
Change-Id: I47b57c6876afd77b47083bf905ade9951ff0b42d
2019-08-29 13:53:47 -07:00
TreeHugger Robot
0ac25af13a Merge "Removing @Deprecated && @removed method from KeyguardManager." 2019-08-29 20:32:46 +00:00
Jeff Sharkey
9857135126 Ignore broken tests, fix flaky tests.
Bug: 112545973
Test: atest --test-mapping frameworks/base/core/java/android/provider/
Change-Id: I0d7635b165826fda9e590b24d17f9bcffaab1cc8
2019-08-29 14:13:09 -06:00
Dave Mankoff
10b34a5a9c Merge "Use a testable version of DeviceConfig in the FalsingManager." 2019-08-29 19:58:37 +00:00
Kevin Hufnagle
86b17d2523 docs: Improved tick/click effect descriptions
Test: make ds-docs -j32

Bug: 139888074
Change-Id: I939aaa4cf81ddab1705611222c12a60823493d38
2019-08-29 19:30:42 +00:00
Mathieu Chartier
83bea97333 Clean up class preloading
Remove logic to set heap target utilization to 0.8. The default is
0.75 and this should not have any fragmentation benefit since the
GC is compacting.

Removed some unused logging and a variable.

Test: TH

Change-Id: Ife7219e94fa0aa7f489569e16248cdd23d09089a
2019-08-29 12:03:09 -07:00