Commit Graph

5752 Commits

Author SHA1 Message Date
Todd Kennedy
de066fd249 Merge "Passing callingUid to internal methods" into oc-dev
am: dacdf2e978

Change-Id: Ie6e85346f63f4b06e693e6a6ac0c73b2ec3b9639
2017-06-08 05:50:03 +00:00
TreeHugger Robot
dacdf2e978 Merge "Passing callingUid to internal methods" into oc-dev 2017-06-08 01:00:52 +00:00
Bryce Lee
50caf4af60 Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev
am: f867733d4f

Change-Id: Icaff526ff266e449eefdc6f471c37d94290662b6
2017-06-07 23:31:48 +00:00
Bryce Lee
f867733d4f Merge "Revert "Coordinate configuration changes and window frame size."" into oc-dev 2017-06-07 23:23:30 +00:00
Bryce Lee
46b01655b3 Revert "Coordinate configuration changes and window frame size."
This reverts commit afb45bba83.

Bug: 32839232
Fixes: 62424393
Change-Id: Ifaa0176e18100ec85b8c81268a26fb16ffe9b5f3
2017-06-07 23:03:09 +00:00
Todd Kennedy
18211fd8f6 Passing callingUid to internal methods
Sometimes callers want to clear the calling identity [to avoid permission
calls]. In this case, allow passing the original calling identity to
internal methods.

Test: Manual; create profile account and observe launcher still works cross profile
Test: bit FrameworksServicesTests:com.android.server.pm.ShortcutManagerTest{1..10}
Change-Id: I73f8ad4b2dc1895227c3fcb14f3f1f18f600562f
Fixes: 38349978
2017-06-07 15:53:21 -07:00
Todd Kennedy
1581bb0b75 Merge "always adjust per-user application info" into oc-dev
am: 91a9d65e42

Change-Id: Ief1ab206a0eb71c9225c000148d0f0b3264a526b
2017-06-07 18:50:33 +00:00
Todd Kennedy
91a9d65e42 Merge "always adjust per-user application info" into oc-dev 2017-06-07 18:42:13 +00:00
Makoto Onuki
a6e0addc26 Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev am: a9c185f6e7
am: a178d194f9

Change-Id: Iec712211a2c83798ae160560d1cca9ce23b7e577
2017-06-06 17:00:17 +00:00
Makoto Onuki
a178d194f9 Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev
am: a9c185f6e7

Change-Id: If571669aaa81d085774c1bb9a0daa308f237978a
2017-06-06 16:44:59 +00:00
Makoto Onuki
a9c185f6e7 Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev 2017-06-06 16:26:10 +00:00
Bryce Lee
906fdb24e6 Merge "Coordinate configuration changes and window frame size." into oc-dev am: 749cbb1911
am: 42e95f8b54

Change-Id: I6ecf592612f5c9d54c37ae9df9525b2f9e14826d
2017-06-06 16:10:17 +00:00
Jeff Sharkey
ec68b46bc8 Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4
am: 7a2e4a8486

Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb
2017-06-06 15:48:24 +00:00
Todd Kennedy
e0046cecb0 always adjust per-user application info
Test: manual; it runs
Change-Id: I98db17ebe9ebe34a5affad44300a55ed68adb565
Fixes: 36561125
2017-06-06 07:51:10 -07:00
Bryce Lee
42e95f8b54 Merge "Coordinate configuration changes and window frame size." into oc-dev
am: 749cbb1911

Change-Id: I2a27d8b34967603b0621332651a31be025542c09
2017-06-06 14:38:58 +00:00
Bryce Lee
afb45bba83 Coordinate configuration changes and window frame size.
Previously, it was possible for the view hierarchy to be measured,
laid out, and drawn around a window frame size that did not match
the current configuration. This stems from new configurations not
always propagating back from WindowSession#relayout, which is
called from ViewRootImpl.

This changelist makes WindowManagerService#relayoutWindow always
return the latest configuration. It also adds rotation to the
configuration.

Fixes: 32839232
Test: go/wm-smoke
Test: Open Camera while rotating phone to landscape. Added
      temporary logs to detect inconsistencies between measurements
      and reported rotation on draw.
Change-Id: I39daca338b4f87eff1a509eb99493f01e710ced1
2017-06-05 20:55:46 -07:00
Jeff Sharkey
7a2e4a8486 Merge "Annotate @SystemApi with required permissions." into oc-dev
am: c1406978a4

Change-Id: I305967cad945a807c3f8234efabaad0ef8b591d1
2017-06-05 22:28:21 +00:00
Jeff Sharkey
d86b8fea43 Annotate @SystemApi with required permissions.
Most @SystemApi methods should be protected with system (or higher)
permissions, so annotate common methods with @RequiresPermission to
make automatic verification easier.

Verification is really only relevant when calling into system
services (where permissions checking can happen on the other side of
a Binder call), so annotate managers with the new @SystemService
annotation, which is now automatically documented.

This is purely a docs change; no logic changes are being made.

Test: make -j32 update-api && make -j32 offline-sdk-docs
Bug: 62263906
Change-Id: I2554227202d84465676aa4ab0dd336b5c45fc651
2017-06-05 13:27:11 -06:00
Makoto Onuki
9aeff8abcc Refer to ShortcutManagerCompat in the javadoc
Bug: 62193112
Test: m offline-sdk-docs and manually checking the result
Change-Id: I5f608f9b22dec595a0e14026a9f4aaf7898bfdba
2017-05-31 09:58:47 -07:00
Jeff Sharkey
b562e53950 Merge commit '06951ac74d9e74b29037b0a5d8e3b9ad85983b5b' into mergeit
am: 3c3d9d8158

Change-Id: Ia4c7f1792c9b6e8e72b4ffe742249b02b82d0817
2017-05-31 14:54:24 +00:00
Jeff Sharkey
3c3d9d8158 Merge commit '06951ac74d9e74b29037b0a5d8e3b9ad85983b5b' into mergeit
Change-Id: Ifa69c7bb53de94312e2b32607fa098c194a4c72c
2017-05-31 08:43:51 -06:00
Jeff Sharkey
ddff807b76 Consistent "low storage" behavior.
When answering the question "how much space is free", use the same
logic for Settings UI and StorageManager.getAllocatableBytes().  That
is, the reported free space is usable bytes plus any cached data the
system is willing to delete automatically.

This does *not* include any reserved cache space, since we don't want
abusive apps to penalize other well-behaved apps that are storing
their data in cache locations.  Callers freeing cached data need to
now explicitly request defiance of the reserved cache space.  (Most
callers are already doing this by using FLAG_ALLOCATE_AGGRESSIVE.)

Rewrite the core logic of DeviceStorageMonitorService to understand
this new "reserved" cache space, and to be easier to understand.  It
also now handles cached data on adopted storage volumes, which had
been ignored until now.  Also fix bug where we had skipped "low"
broadcasts when the device skipped directly from/to "full" state.

Bug: 38008706
Test: cts-tradefed run commandAndExit cts-dev -m CtsJobSchedulerTestCases -t android.jobscheduler.cts.StorageConstraintTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Change-Id: Icbdcf3b52775f7ada1ceaeff2f96094c8d8052f9
2017-05-30 22:17:23 -06:00
Christopher Tate
fe2368c38c Refresh in-memory SharedPreferences instances after restore
Existing instances don't know that the file has changed out from
under them, so they continue to return stale values from reads, and
risk overwriting restored data with stale content if writes are
performed.  We now tell the backing cache system to induce a
reload after restore (i.e. after we might have written a relevant
file out from under it).

Along the way we shook out an irregularity in the way we were
setting up the context topology of non-lifecycle instances of
the metadata-handling BackupAgent subclass, so that's fixed
now too.

Bug 12061817
Test: cts-tradefed run cts -m CtsBackupHostTestCases

Change-Id: I401fe9297235b55d8a8f041e430d122dc6e24129
2017-05-30 12:41:39 -07:00
Adam Lesinski
6ea208d059 Merge "Add ResourceId validation helper method" into oc-dev am: 24c18af14a
am: 01b95f9067

Change-Id: I7097af67601496f56741a5f5e43f953ba8134ce0
2017-05-26 19:01:00 +00:00
Adam Lesinski
01b95f9067 Merge "Add ResourceId validation helper method" into oc-dev
am: 24c18af14a

Change-Id: I18dc41c220d3cd91c8ce78d93de860064c5f2294
2017-05-26 18:55:15 +00:00
Adam Lesinski
24c18af14a Merge "Add ResourceId validation helper method" into oc-dev 2017-05-26 18:45:28 +00:00
Tenghui Zhu
912684514a Merge "Create a new drawable after caching the DrawableContainer" into oc-dev am: 36d6a985cd
am: 246bf5cb9b

Change-Id: I0ef7196cdb87d40be15adff868ca4fcc17addd60
2017-05-26 16:32:10 +00:00
Tenghui Zhu
246bf5cb9b Merge "Create a new drawable after caching the DrawableContainer" into oc-dev
am: 36d6a985cd

Change-Id: I53422934c6bf84033fdfff94c5eda79275e91b3a
2017-05-26 16:22:09 +00:00
Tenghui Zhu
36d6a985cd Merge "Create a new drawable after caching the DrawableContainer" into oc-dev 2017-05-26 16:10:25 +00:00
Nicolas Geoffray
4414db2da2 Merge "resolve merge conflicts of 255b69aca0 to oc-dev-plus-aosp" into oc-dev-plus-aosp
am: b118505ef0

Change-Id: I6e9963188b487de4e76dc0d17d56b53050fd3745
2017-05-26 10:20:39 +00:00
Nicolas Geoffray
7e1a273708 resolve merge conflicts of 255b69aca0 to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9caf7542f11b0b322da063a5a08140384eba0ce0
2017-05-26 11:03:19 +01:00
Nicolas Geoffray
3b4359a06c Pass bootComplete to dexopt.
bug: 37165062
Test: After OTA, check bootComplete=false on package updates
Change-Id: I6fc00216020bb16d8ed4f6e839b5e1df0e942700
2017-05-25 13:56:00 +01:00
Adam Lesinski
9553fb3240 Add ResourceId validation helper method
An invalid, 'null' resource ID is defined as 0. Apps often use -1.

Add a helper method that makes checking valid IDs easy and more
centralized.

Eventually make it public API.

Bug: 38393777
Test: manual
Change-Id: I969ec4a45e86bdab3d7f57d357d475b77c7f8a78
2017-05-24 15:39:23 -07:00
Todd Kennedy
c50c89a5d8 Merge "System installed launcher can see instant apps" into oc-dev am: 1de10d6602
am: 4cdc26746e

Change-Id: I2a66bfa001ea03205535bc0337f720d869fa9132
2017-05-24 21:01:01 +00:00
Todd Kennedy
4cdc26746e Merge "System installed launcher can see instant apps" into oc-dev
am: 1de10d6602

Change-Id: I70d707c25ed793bd2ad8e58f3558d2a4d0b6e980
2017-05-24 20:49:59 +00:00
TreeHugger Robot
1de10d6602 Merge "System installed launcher can see instant apps" into oc-dev 2017-05-24 20:38:56 +00:00
TreeHugger Robot
9a4b440542 Merge "Unhide system feature flag FEATURE_WIFI_PASSPOINT" 2017-05-24 15:51:32 +00:00
Todd Kennedy
3051caac52 System installed launcher can see instant apps
Change-Id: I97f791b61f9b4f7ed33305345bf3d92394b40ae4
Fixes: 38202759
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
Test: Manual. Create sample app that replaces the launcher to test ability to see ephemeral apps.
2017-05-24 07:34:55 -07:00
Adam Lesinski
86f26d942f Merge "Resources: fix race with creating theme" into oc-dev am: 5f70bc89be
am: 006a6fa850

Change-Id: Iab03f37f7e63cb23401b27b8d54ea042e7f63df3
2017-05-23 23:25:22 +00:00
Adam Lesinski
006a6fa850 Merge "Resources: fix race with creating theme" into oc-dev
am: 5f70bc89be

Change-Id: I73bb76a7ff3fe6d3e0a974b5cbaed34c632ee8ae
2017-05-23 23:19:26 +00:00
Adam Lesinski
4fed971437 Resources: fix race with creating theme
Bug: 38353957
Test: none
Change-Id: Id78770b475b979635da6a4067db6269e3a1b04d6
2017-05-23 13:14:54 -07:00
Suprabh Shukla
83b66b2289 Validating non-empty authority and accountType
Code was check for null but empty strings are also not allowed.

Test: Manually installed the app causing the bootloop before the fix.
Rebooted the device to force schedule a sync and observed no crash.

Fixes: 19893917
Change-Id: If13aa0ac4cb3358da4b8e2bc62cb277d5248edaa
2017-05-23 19:37:15 +00:00
Dianne Hackborn
f0268b0bb7 Merge "Fix issue #38393543: Not allowed to start service Intent" into oc-dev am: ad6dde65ff
am: 7fdeb9ff3f

Change-Id: Ie6cfe023f733079d3fb685b841bc0e90506c0ab3
2017-05-22 20:20:38 +00:00
Dianne Hackborn
7fdeb9ff3f Merge "Fix issue #38393543: Not allowed to start service Intent" into oc-dev
am: ad6dde65ff

Change-Id: Ife26f513fa6d04771148a3965171822874854828
2017-05-22 20:09:29 +00:00
Dianne Hackborn
ad6dde65ff Merge "Fix issue #38393543: Not allowed to start service Intent" into oc-dev 2017-05-22 20:03:33 +00:00
Dianne Hackborn
3e6e3855ea Fix issue #38393543: Not allowed to start service Intent
Turns out there was another path in to the activity manager
to trigger a PendingIntent, which needs to be modified to
now also pass in the whitelist token of that pending intent.

Test: manual
Change-Id: I755ff87db1b782fa6974d404dcb490786053c5e0
2017-05-19 16:12:08 -07:00
ztenghui
ee7e8f13ea Create a new drawable after caching the DrawableContainer
fix:37135264

Test: Add new CTS test
bit
CtsGraphicsTestCases:android.graphics.drawable.cts.DrawableContainerStateTest,
CtsGraphicsTestCases:android.graphics.drawable.cts.DrawableContainerTest,
CtsGraphicsTestCases:android.graphics.drawable.cts.Drawable_ConstantStateTest

Change-Id: I8bb868d16a944f746ec41d3e37ae4215b964d949
2017-05-19 12:29:14 -07:00
Seigo Nonaka
c07169eddc Merge "Introduce early exit path for non resource path." into oc-dev am: 01d5b3d2af
am: 99c587a9b1

Change-Id: I7e09b074f7fff0f273ca2be896439bae0c0c92d0
2017-05-18 23:54:24 +00:00
Seigo Nonaka
99c587a9b1 Merge "Introduce early exit path for non resource path." into oc-dev
am: 01d5b3d2af

Change-Id: I07120a86307dd397862e0d341763d0048b066845
2017-05-18 23:39:41 +00:00
TreeHugger Robot
01d5b3d2af Merge "Introduce early exit path for non resource path." into oc-dev 2017-05-18 23:30:24 +00:00