Commit Graph

301953 Commits

Author SHA1 Message Date
Jeff Sharkey
18ade37c6b Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev
am: 32d2b4c7af  -s ours

Change-Id: Id4cf3526f7892971e4f226e98036166cbe8d28ef
2016-12-02 01:14:27 +00:00
Jeff Sharkey
d9a7f11334 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: f084ccd48d  -s ours

Change-Id: I9b4630b18d52ad503b88380c1a853bf3c0b46a10
2016-12-02 01:14:23 +00:00
Jeff Sharkey
e94d76436b DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am: 3e0d93036b am: 061e7313b4
am: 50102e63da  -s ours

Change-Id: I3a587cb124b30ef5062600e7ba870da58213a094
2016-12-02 01:13:18 +00:00
Jeff Sharkey
f70dd1fbc1 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours am: 1da786d723 am: af5f47caca
am: ee8e0e8ae3

Change-Id: I24fd90b2e61aabe95ccc5891c02fbbe2c795ba18
2016-12-02 01:13:13 +00:00
Jeff Sharkey
dd32a67b33 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220 am: 2d549764be am: b981c3be70 -s ours
am: a24a33490a

Change-Id: I8564b110d58f63aeee8afeab87773e97b7301a60
2016-12-02 01:13:09 +00:00
Jeff Sharkey
a0b41fca40 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours am: 704085119d am: 8bd3aa70ad -s ours
am: 60cc001b28

Change-Id: Ic21f6cc9072ae65ba67f117a21c4703e8f8cf6ea
2016-12-02 01:13:04 +00:00
TreeHugger Robot
32d2b4c7af Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev 2016-12-02 01:10:36 +00:00
Jeff Sharkey
a24a33490a DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220 am: 2d549764be
am: b981c3be70  -s ours

Change-Id: I22fe97ae93c6e665288d46c29429ca7690352fb3
2016-12-02 01:07:07 +00:00
Jeff Sharkey
ee8e0e8ae3 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours am: 1da786d723
am: af5f47caca

Change-Id: Idc1de786eee9966a0d555affdb2ac41fa134eb55
2016-12-02 01:06:56 +00:00
Jeff Sharkey
50102e63da DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am: 3e0d93036b
am: 061e7313b4

Change-Id: If0723e8cb1484263a3b96b37d21132d2ebc9b1b5
2016-12-02 01:06:56 +00:00
jackqdyulei
1b515eeb98 Remove hardcode color in styles.xml
In this cl, we made the change below:
1. textcolor in clock style
2. textcolor in TextAppearance.QS

Bug: 32592245
Test: manual
Change-Id: Ic7b2d1212c1c7f18a791688d5c82467e40c2ff5d
2016-12-01 17:06:08 -08:00
Jeff Sharkey
60cc001b28 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours am: 704085119d
am: 8bd3aa70ad  -s ours

Change-Id: I3ef5d68391566fc428906799a6ec6d166b9479a4
2016-12-02 01:01:52 +00:00
Jeff Sharkey
af5f47caca DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours
am: 1da786d723

Change-Id: I09b766396a8334551917723a47d5bba2590cb2bd
2016-12-02 01:01:51 +00:00
Jeff Sharkey
b981c3be70 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220
am: 2d549764be

Change-Id: Iad255e684d36524388a659181da0535bd15e37dc
2016-12-02 01:01:49 +00:00
Jeff Sharkey
061e7313b4 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3
am: 3e0d93036b

Change-Id: Ice0b80b96cdd7ad1a7691919982d98266a37f8bf
2016-12-02 01:01:49 +00:00
Etan Cohen
0ae58fa665 [AWARE] Fix javadocs for match filter update
Javadocs update. Specifically, cannot contain generics (since
under-the-hood generics are just the undecorated class).

Bug: 32840891
Test: generated docs (no functional change)
Change-Id: I4bc2967a60ad27d137fd5a4dd3db18625343c910
2016-12-01 16:59:41 -08:00
TreeHugger Robot
c1070e7632 Merge "Don't send SCREEN_ORIENTATION_UNSET to apps." 2016-12-02 00:57:51 +00:00
Jeff Sharkey
1da786d723 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2
am: b9a0b79675  -s ours

Change-Id: I82040d83bc780656b5deaa4fbe664700567e2138
2016-12-02 00:56:36 +00:00
Jeff Sharkey
8bd3aa70ad DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours
am: 704085119d

Change-Id: Ic687581a9bf5f0906cdb7642e59b81d9b6175aca
2016-12-02 00:56:32 +00:00
Jeff Sharkey
3e0d93036b DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: 3b0aa060a3

Change-Id: I3ba9a8dedfda4d878b99cc7de8a41418d424495c
2016-12-02 00:56:31 +00:00
Jeff Sharkey
2d549764be DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: fbf395c220

Change-Id: I453445723ea9f6124d876dc32c6defab42432351
2016-12-02 00:56:26 +00:00
Adrian Roos
047c01362c Merge "DO NOT MERGE Show keyguard when SIM is removed" into nyc-mr2-dev am: b9bcde0444
am: 3f4380a359  -s ours

Change-Id: I9416c37c4ca716d613f4d1ee262e2b4eb1502963
2016-12-02 00:51:49 +00:00
Adrian Roos
09a5c2c1e8 DO NOT MERGE Show keyguard when SIM is removed am: fd61f22210
am: 097e285536  -s ours

Change-Id: I855c159c777290d06e440d5338d048b6db4f0d7b
2016-12-02 00:50:37 +00:00
Jeff Sharkey
b9a0b79675 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: 1de465bec2

Change-Id: I14f82fa9c555bea0e71553713436a6836a421691
2016-12-02 00:50:29 +00:00
Jeff Sharkey
704085119d DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: f279a5bc0d  -s ours

Change-Id: I7fde8a3cd529bc495aa7e886988d73e22815c0b4
2016-12-02 00:50:27 +00:00
Adam Lesinski
b6811c172d Merge "Add --testdata flag for easier testing" 2016-12-02 00:45:03 +00:00
Adrian Roos
3f4380a359 Merge "DO NOT MERGE Show keyguard when SIM is removed" into nyc-mr2-dev
am: b9bcde0444

Change-Id: I958f0a1d10dacfee874e52f9a92bcec637e26f84
2016-12-02 00:41:37 +00:00
Adrian Roos
097e285536 DO NOT MERGE Show keyguard when SIM is removed
am: fd61f22210

Change-Id: I3ace21a3f5b66ab4395b5511701caf102a6546ef
2016-12-02 00:41:27 +00:00
Treehugger Robot
1981812450 Merge "jni: EventLog replace open coding with android_log_event_list" 2016-12-02 00:39:55 +00:00
TreeHugger Robot
b9bcde0444 Merge "DO NOT MERGE Show keyguard when SIM is removed" into nyc-mr2-dev 2016-12-02 00:31:14 +00:00
Chad Brubaker
32d07dce7a Disallow sharedUserId in Ephemeral apps
Test: adb install --ephemeral apk fails with a shareduid defined
Change-Id: I2e03d89b983b99e35ea799618f6830b309c09b49
2016-12-01 16:17:40 -08:00
Fyodor Kupolov
a97c9066a2 Test permission grants for all privapps
Test that requested signature|privileged permissions are granted to all privileged apps.
If the mode is enforcing, also make sure permissions are whitelisted.

Test: test passes
Bug: 31008485
Change-Id: Id7f007a79477c46f40c12765873c563df6bc92cf
2016-12-01 16:11:24 -08:00
Jeff Sharkey
72b84a23c9 Grant Uri permissions for new screenshots.
The receiving app may not have the needed permissions to see the
screenshot when launched.

Test: builds, boots, no longer logs
Bug: 33275110
Change-Id: I8b9b4fea2f78f37af543a90309cb34994366850b
2016-12-01 17:10:29 -07:00
Jeff Sharkey
17010dc0d2 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-02 00:05:40 +00:00
Jeff Sharkey
6eee8e37fd DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-01 17:04:32 -07:00
Jeff Sharkey
f279a5bc0d DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-01 23:54:50 +00:00
Jeff Sharkey
1de465bec2 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-01 23:54:04 +00:00
Jeff Sharkey
f084ccd48d DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-01 23:51:49 +00:00
Jeff Sharkey
fbf395c220 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-01 23:51:25 +00:00
Jeff Sharkey
3b0aa060a3 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-01 16:50:29 -07:00
Robert Greenwalt
297e9f9a32 Merge "Get the correct operator name" 2016-12-01 23:29:28 +00:00
Makoto Onuki
106ff7a0a1 ShortcutManager: Floating shortcuts shouldn't have target activities.
Previously, even floating shortcuts (pinned but not dynamic nor
manifest) had target activities.  Now we're going to allow headless
apps to have pinned shortcuts, in which cases shortcuts won't have
target activities, let's just always remove target activities
from floating shortcuts.

Test: adb shell am instrument -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
... to Test8.

Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsShortcutManagerTestCases
Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsShortcutHostTestCases

Change-Id: I10e5b87338cafb90e6566b3526f892c5330c73e9
2016-12-01 23:09:52 +00:00
Julius D'souza
e8ac4110c8 Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev am: afccacad68 am: 829c45d5be
am: deb3516131  -s ours

Change-Id: I253cc1415c43facdb2252d4b2f57fc9c682db43f
2016-12-01 22:57:50 +00:00
Julius D'souza
6527f14ff3 DO NOT MERGE: Sync with master: Add initial ambient light sensor rate am: 5c7ae14148 am: c384a24668
am: 8794b6dfdc  -s ours

Change-Id: Icc25720cd3f75d3450ccf3a1ab64213f53eeff26
2016-12-01 22:56:42 +00:00
Julius D'souza
9e81bbebec Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev am: afccacad68 am: c8df3b4db8
am: 746007571a  -s ours

Change-Id: I1538c44355b29b240bebe3a4ba39b503875d386d
2016-12-01 22:51:30 +00:00
Julius D'souza
b960a0cbca DO NOT MERGE: Sync with master: Add initial ambient light sensor rate am: 5c7ae14148 am: a83f940349
am: 4e9400ab27  -s ours

Change-Id: I966f168a1e4f58d77bd9d46996ae3989831c9d24
2016-12-01 22:50:26 +00:00
Adrian Roos
fd61f22210 DO NOT MERGE Show keyguard when SIM is removed
If the device has a secure lockscreen and the device'
SIM card is removed, lock the device.

Change-Id: I0369af81297169d65254b85bc9a056e4f4a02b7b
Merged-In: I5b0deea8851b38781059732a3cf6fa0a4a00e3ca
Fixes: 30997251
2016-12-01 22:49:50 +00:00
Julius D'souza
deb3516131 Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev am: afccacad68
am: 829c45d5be

Change-Id: Ic5677f8f4824301d20c82ace3f2c414f4b076317
2016-12-01 22:47:13 +00:00
Julius D'souza
8794b6dfdc DO NOT MERGE: Sync with master: Add initial ambient light sensor rate am: 5c7ae14148
am: c384a24668

Change-Id: I68876a2ae8fe5d850d531a9135646aff2b28fb72
2016-12-01 22:46:09 +00:00
Julius D'souza
746007571a Merge "DO NOT MERGE: Sync with master: Add initial ambient light sensor rate" into cw-f-dev am: afccacad68
am: c8df3b4db8

Change-Id: I26a5625bfb4882d36b1ebb5fab2dfe8ff77131ff
2016-12-01 22:41:48 +00:00