Jeff Sharkey
00f8ad0a11
Merge "Protect usage data with OP_GET_USAGE_STATS." into pi-dev am: 936c0868f8
...
am: 7b913d70b9
Change-Id: Ifd131fb60996e416f44f7acc68257e4663ef4ba7
2018-04-16 18:43:09 -07: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
b35cfd79ab
Merge "Remove temporary logging." into pi-dev am: 216b50ad97
...
am: 1f6cebfab1
Change-Id: I05f5b91406ad73aa8140bf36b1c2381667adcc88
2018-04-16 11:18:10 -07: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
9f36e8d4d5
Merge "Doc change: removed reference to the reverted Password Blacklist feature." into pi-dev am: bdf8f1e3a2
...
am: 525ccce945
Change-Id: Ifee52d60db26754bb08fd4c63e903c385ceeadee
2018-04-16 08:13:50 -07: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
4b5599c174
Merge "Fix pinned slices returning different Uris." into pi-dev am: b672c1f97c
...
am: 8e70dd482b
Change-Id: I7d46f978d710f7a559a16a4ceddaf32d05a38fcf
2018-04-12 20:14:49 -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
Selim Cinek
c5ae11b044
Merge "Changed the appearance of phone call notifications" into pi-dev am: e0a25acf08
...
am: aab697426c
Change-Id: I0ca3ceadf4480b3d1524802d7c1ad0c60e1df2ec
2018-04-12 17:14:20 -07: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
Julia Reynolds
28bca54de3
Merge "Merge "Add method to get blocked app count" into pi-dev am: 5d1db91ecb" into pi-dev-plus-aosp
...
am: 8da08210e5
Change-Id: I6ed90f91926166b227b5b15b81855fa86d375d27
2018-04-12 16:36:02 -07: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
8319f2db3d
Merge "[Notif] Allow locking importance on notification" into pi-dev am: 8e7f23a74c
...
am: 0c91614746
Change-Id: I2710212987e9647d23d80d972ef826dc2358c53e
2018-04-12 08:08:13 -07: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
cbb04c868d
Merge "Clean up APIs before declaring API 28." into pi-dev am: fb10508cfa
...
am: b129fadef8
Change-Id: I9b8414b89138651f3b3132789cae59ad6780dbb6
2018-04-12 05:45:08 -07: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
266ee2b1f1
Merge "Fix broken target SDK checks." into pi-dev am: aab3304a22
...
am: 87caa7b9ad
Change-Id: I2d0d813284e483b05bf73d5d91fcfa13bce967d8
2018-04-11 21:58:49 -07: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
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
30524c6f64
Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev am: c2375d9b3d
...
am: df0975bba5
Change-Id: I932361f18e0619224e840f4582c729908818fa96
2018-04-11 12:37:44 -07:00
Colin Cross
359652ed80
Merge "Revert "Update docs to match encryption requirements"" into pi-dev am: fcbbb72603
...
am: 3b11a4cb19
Change-Id: Iea81963ea09510a5c3d1c8d801dde83201122743
2018-04-11 12:32:06 -07:00
Bookatz
a156a23a46
Merge "StatsManager throws exceptions" into pi-dev am: 6b317915e8
...
am: b1d3483102
Change-Id: Ib8b72e4a6a21300ba843325a69847856bd9346aa
2018-04-11 11:56:31 -07: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
TreeHugger Robot
6b317915e8
Merge "StatsManager throws exceptions" into pi-dev
2018-04-11 17:02:06 +00:00
Florian Mayer
309f185877
Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev am: f1657a827f
...
am: 3975415df5
Change-Id: Ic02215baf0f945d7fe1700e7ba8baf1ef1fd8f60
2018-04-11 07:29:37 -07:00
Robert Berry
fc40d0837d
Merge "Update docs to match encryption requirements" into pi-dev am: bfa13fe76f
...
am: ed11ba6182
Change-Id: I04f1c3d166c8c4cc243608b6bcffddb734dc482a
2018-04-11 07:18:23 -07:00
Florian Mayer
3975415df5
Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev
...
am: f1657a827f
Change-Id: Ic7356df8144ca41a89bfbf194155bc41058a200d
2018-04-11 07:15:16 -07:00
Robert Berry
ed11ba6182
Merge "Update docs to match encryption requirements" into pi-dev
...
am: bfa13fe76f
Change-Id: I81f6a613bc8ef123ce33f53bfc6a44092d72a7a9
2018-04-11 07:10:28 -07:00
Jason Monk
5ffacd06ac
Fix docs and bug in SliceManager#bindSlice
...
Test: cts
Change-Id: I812af1eda072c2af0b29454a05ea777d8f4c3c62
Fixes: 73123733
2018-04-11 10:05:57 -04:00
Florian Mayer
f1657a827f
Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev
2018-04-11 13:55:51 +00:00
Robert Berry
bfa13fe76f
Merge "Update docs to match encryption requirements" into pi-dev
2018-04-11 13:49:45 +00:00