Commit Graph

13305 Commits

Author SHA1 Message Date
Beverly Tai
e4a5044b0f Merge "Don't mute ringer if apps can bypass dnd" into pi-dev
am: 39997ea603

Change-Id: Ie8bb9617d8439fdcf739f9fe5264aaa5d0421d72
2018-04-19 09:29:53 -07:00
Beverly Tai
39997ea603 Merge "Don't mute ringer if apps can bypass dnd" into pi-dev 2018-04-19 16:08:28 +00:00
Jeff Sharkey
993106c06a Merge "Visit Uris in RemoteViews for granting purposes." into pi-dev
am: 1cd96854d4

Change-Id: Ie979847bd41777cef2b4169cb7f78abe174d054d
2018-04-19 08:09:24 -07:00
Jeff Sharkey
1cd96854d4 Merge "Visit Uris in RemoteViews for granting purposes." into pi-dev 2018-04-19 14:58:02 +00:00
Jeff Sharkey
23b3118f28 Visit Uris in RemoteViews for granting purposes.
RemoteViews end up passing around Uris, so we need to extend Uri
permission grants for them to ensure the recipient of a Notification
object is able to render its contents.

Bug: 9069730
Test: atest frameworks/base/services/tests/uiservicestests/src/com/android/server/notification
Change-Id: Id31b5adaf2ee66113a1b503e32126aeddbf97b28
2018-04-18 21:40:47 -06:00
Jason Monk
d1a9320e98 Merge "Make Instrumentation more robust to other inputs" into pi-dev
am: 3071522227

Change-Id: Ifc3e5c1959a3b25025f396fbfc91363580b239ad
2018-04-18 16:54:05 -07:00
Jason Monk
e96443e5a7 Make Instrumentation more robust to other inputs
Test: atest cts/tests/app/src/android/app/cts/InstrumentationTest.java
Change-Id: I2d55274ab19c4687ce85c086f2da61a4316b8096
Fixes: 70720100
2018-04-18 15:43:50 -04:00
Beverly
86d076f9d3 Don't mute ringer if apps can bypass dnd
Test: atest RankingHelperTest
Change-Id: I587e5b8d4f6cfe3b384c5b4b9e72de12b6639b6f
Fixes: 77729075
2018-04-18 14:10:19 -04:00
Jason Monk
86e2a2ab32 Merge "Slices: Don't use public namespace for internal intent" into pi-dev
am: 84208c724e

Change-Id: I95ea37a760470dcfdfb4ac9c1ab5c99c2fc72a5d
2018-04-18 09:44:14 -07:00
Julia Reynolds
8e7df9edb2 Merge "Color and text changes" into pi-dev
am: 03ddb28cda

Change-Id: I0d66ab47686ef3d63d5a18bef890891a66261203
2018-04-18 07:41:46 -07:00
Jason Monk
0c179a94a9 Slices: Don't use public namespace for internal intent
Test: manual
Change-Id: I21bc0a367456b58de195d71fc29cca0dbbca6927
Fixes: 78214697
2018-04-18 10:37:19 -04:00
Julia Reynolds
6013e5cc96 Color and text changes
Change-Id: I2b1837ffd16911be20b5d5f9a7007ff3071265ab
Fixes: 78191129
Fixes: 77810424
Fixes: 78196346
Test: manual inspection
2018-04-18 08:45:12 -04:00
Sudheer Shanka
7cefde2e83 Merge "Update Instrumentation.newActivity to pass non-null application." into pi-dev
am: 850c6662b0

Change-Id: I152d5029366aba600dc81ea6eb9113ff22fd1bec
2018-04-17 15:39:18 -07:00
Sudheer Shanka
850c6662b0 Merge "Update Instrumentation.newActivity to pass non-null application." into pi-dev 2018-04-17 22:06:09 +00:00
Patrick Baumann
ee2a275142 Merge "Checks that secondary instrumentation ABI matches" into pi-dev
am: 096e0587d2

Change-Id: I87d562322a5b77de9a17dfd803da2c4aa4f2027c
2018-04-17 11:30:24 -07:00
Patrick Baumann
eb59580abd Checks that secondary instrumentation ABI matches
This adds checks that the secondary ABI for an instrumentation package
matchs that of its target before using it when forced and warns of
mismatches.

Change-Id: I394427721c83cbd1c3c6af6cee24a93b18d8c65f
Fixes: 77152863
Test: gts-tradefed > run gts -m GtsBackupHostTestCases -a armeabi-v7a do not all fail with NPE
2018-04-17 09:55:47 -07:00
Benjamin Miller
c886324aa2 Merge "Docs: update the method description for installKeyPair() to cover parameter change." into pi-dev
am: 5037beea1c

Change-Id: I36650a1acc5e6eaf9c192f12927425c253bb0b6d
2018-04-17 04:06:20 -07:00
TreeHugger Robot
5037beea1c Merge "Docs: update the method description for installKeyPair() to cover parameter change." into pi-dev 2018-04-17 10:53:36 +00:00
Jeff Sharkey
7b913d70b9 Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev
am: 936c0868f8

Change-Id: I3c84c646b3a79f09dc1210e18f48d1f87d38abd4
2018-04-16 17:44:58 -07:00
Jeff Sharkey
936c0868f8 Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev 2018-04-17 00:04:53 +00:00
Jeff Sharkey
6b64925737 Protect usage data with OP_GET_USAGE_STATS.
APIs that return package usage data (such as the new StatsManager)
must ensure that callers hold both the PACKAGE_USAGE_STATS permission
and the OP_GET_USAGE_STATS app-op.

Add noteOp() method that can be called from native code.

Also add missing security checks on command interface.

Bug: 77662908, 78121728
Test: builds, boots
Change-Id: Ie0d51e4baaacd9d7d36ba0c587ec91a870b9df17
2018-04-16 12:44:32 -06:00
Bryce Lee
1f6cebfab1 Merge "Remove temporary logging." into pi-dev
am: 216b50ad97

Change-Id: I49b008a4173e0c3fee6a3e3202f5b18c1c991fc9
2018-04-16 10:54:57 -07:00
Bryce Lee
216b50ad97 Merge "Remove temporary logging." into pi-dev 2018-04-16 17:36:45 +00:00
Benjamin Miller
8040fd1b62 Docs: update the method description for installKeyPair() to cover parameter change.
Update the description to cover the parameter changed from (boolean)isUserSelectable to (int)flags.
Bug: 78113127
Test: make ds-docs and inspect generated HTML.

Change-Id: I8356ffd2d0a61f4c2c62bbf2440a6315399a33ef
2018-04-16 15:52:15 +00:00
Benjamin Miller
525ccce945 Merge "Doc change: removed reference to the reverted Password Blacklist feature." into pi-dev
am: bdf8f1e3a2

Change-Id: I78270fc1f639f87c3a26ab97ec526c902ff081c7
2018-04-16 08:01:15 -07:00
Benjamin Miller
cc12c5fb11 Doc change: removed reference to the reverted Password Blacklist feature.
Bug: 73750934
Test: make ds-docs and inspected HTML output.

Change-Id: I545ef13219dc994a4f157cc6f2380eac59331498
2018-04-16 13:45:54 +00:00
Bryce Lee
1d0d514dac Remove temporary logging.
This changelist reverts the following CLs that added temporary
logging:
d946f86f12
a33c13df13
e7b2f6920b

Fixes: 71506345
Test: presubmit
Change-Id: Icfc016a752e5ac2bfb1537be67cda1c4ea3e6442
2018-04-13 10:30:01 -07:00
Jason Monk
8e70dd482b Merge "Fix pinned slices returning different Uris." into pi-dev
am: b672c1f97c

Change-Id: If07c9fb4b3391cce7c555430ffb5b0fbdb760777
2018-04-12 20:03:23 -07:00
TreeHugger Robot
b672c1f97c Merge "Fix pinned slices returning different Uris." into pi-dev 2018-04-13 02:48:39 +00:00
Jason Monk
199286b084 Fix pinned slices returning different Uris.
Test: cts
Bug: 77980070
Change-Id: I3c5ba18e40a58371e2c9ccade9d565b38ad12a54
2018-04-12 20:05:27 -04:00
Selim Cinek
aab697426c Merge "Changed the appearance of phone call notifications" into pi-dev
am: e0a25acf08

Change-Id: I3690cabd01e979324faddbc0b8f8b99fe6364dcb
2018-04-12 15:53:34 -07:00
Julia Reynolds
f563c31c39 Merge "Add method to get blocked app count" into pi-dev
am: 5d1db91ecb

Change-Id: I727f62d74e135c4dd3d991b110ebf4ac6d5698f5
2018-04-12 15:23:51 -07:00
TreeHugger Robot
e0a25acf08 Merge "Changed the appearance of phone call notifications" into pi-dev 2018-04-12 21:01:16 +00:00
Selim Cinek
396cacaaa8 Changed the appearance of phone call notifications
The old design didn't work at all because of various
paddings. The new design adds more paddings and a
new button style

Fixes: 72814598
Test: runtest systemui
Change-Id: I4b4ac0790afe45db97f912740446c6da09620be3
2018-04-12 11:09:23 -07:00
Julia Reynolds
e273f08c0b Add method to get blocked app count
So we can sure it in settings

Test: runtest systemui-notification
Bug: 73018368
Change-Id: Ib0185e97f8e1cec1864ca1e4efb23bf8db097901
2018-04-12 13:48:49 -04:00
Rohan Shah
0c91614746 Merge "[Notif] Allow locking importance on notification" into pi-dev
am: 8e7f23a74c

Change-Id: I7ddba513e0173fbaba844ea7dea61861a5f77951
2018-04-12 07:58:28 -07:00
Rohan Shah
8e7f23a74c Merge "[Notif] Allow locking importance on notification" into pi-dev 2018-04-12 14:49:11 +00:00
Wale Ogunwale
b129fadef8 Merge "Clean up APIs before declaring API 28." into pi-dev
am: fb10508cfa

Change-Id: Ic20ef429dbae1c9c5702094e1203838517b3ec38
2018-04-12 05:33:09 -07:00
Wale Ogunwale
fb10508cfa Merge "Clean up APIs before declaring API 28." into pi-dev 2018-04-12 12:19:56 +00:00
Jeff Sharkey
87caa7b9ad Merge "Fix broken target SDK checks." into pi-dev
am: aab3304a22

Change-Id: Ib43fd6704d6982104f11504b3d43db9edcfa9d41
2018-04-11 21:49:58 -07:00
TreeHugger Robot
aab3304a22 Merge "Fix broken target SDK checks." into pi-dev 2018-04-12 04:40:06 +00:00
Rohan Shah
590e1b2aa5 [Notif] Allow locking importance on notification
Currently locking  only works on channel - this CL allows doing
so on the overarching notification too. Added locking field in
appropriate places in record and surfaced it to other bits via
the RankingHelper.

Test: Visually, reproduced organically (+ deleting /data/ files)
Fixes: 77775657
Change-Id: Ie46093921dd6c1ae3533ded7b87faaa475a631e4
2018-04-11 21:57:49 -04:00
Sudheer Shanka
378207114e Update Instrumentation.newActivity to pass non-null application.
Activity.attach expects a non-null application, so pass an empty
applicaiton if Instrumentation.newActivity is called with a null obj.

Change-Id: If4a131ef46f101b8b4a726886fe76412c45c30ec
Fixes: 73294588
Test: atest tests/app/src/android/app/cts/TabActivityTest.java
2018-04-11 15:49:55 -07:00
Jeff Sharkey
3990ee1c9f Clean up APIs before declaring API 28.
As part of finalizing an SDK, we need to ensure that no new APIs are
marked @Deprecated, since they're typically cleanup that someone
forgot to finish.

Someone forgot to replace Slice.getTimestamp() with Slice.getLong().

Bug: 77588754
Test: builds, boots
Exempt-From-Owner-Approval: SDK finalization
Change-Id: Ic0ec91a43d161a69c1e840c42046ad500b7aeca0
2018-04-11 13:49:21 -06:00
Jason Monk
df0975bba5 Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev
am: c2375d9b3d

Change-Id: Id7145e9d6432586d295f59b67a4f3b7e44d935b1
2018-04-11 11:56:07 -07:00
Colin Cross
3b11a4cb19 Merge "Revert "Update docs to match encryption requirements"" into pi-dev
am: fcbbb72603

Change-Id: I7b66ab3cb2362a6fa91d90b4b7237d6f3760b406
2018-04-11 11:44:45 -07:00
Bookatz
b1d3483102 Merge "StatsManager throws exceptions" into pi-dev
am: 6b317915e8

Change-Id: I3de523046404285f3bcc7bfff598393d7c16820d
2018-04-11 11:19:33 -07:00
TreeHugger Robot
c2375d9b3d Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev 2018-04-11 17:52:22 +00:00
Colin Cross
fcbbb72603 Merge "Revert "Update docs to match encryption requirements"" into pi-dev 2018-04-11 17:28:39 +00:00
Colin Cross
4da1774894 Revert "Update docs to match encryption requirements"
This reverts commit cebb55ea9d.

Reason for revert: broke docs builds

Change-Id: I3a4b8d274141efec90fae2ed0b9324194288c635
2018-04-11 17:27:24 +00:00