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
Phil Weaver
85be2cdda9
Merge "Move accessibilityHeader from TextView to View" into pi-dev am: 99a238adf1
...
am: d3adf76761
Change-Id: I7c3045b0a4da4aa9e8d9060d02ec0dafd67f6f33
2018-04-11 20:23:53 -07:00
Phil Weaver
d3adf76761
Merge "Move accessibilityHeader from TextView to View" into pi-dev
...
am: 99a238adf1
Change-Id: I126e03f378abc0cc9554069f0af10bd6f003081a
2018-04-11 20:15:20 -07:00
Phil Weaver
99a238adf1
Merge "Move accessibilityHeader from TextView to View" into pi-dev
2018-04-12 03:07:57 +00:00
Makoto Onuki
a31a1c67f4
Merge "Add stats logging to ServiceManager and NPMS" into pi-dev am: a26e755900
...
am: fa3a2acfbc
Change-Id: I30bea4b59318ac1871293739c6c5f2d9b7551fb1
2018-04-11 19:01:30 -07: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
Makoto Onuki
fa3a2acfbc
Merge "Add stats logging to ServiceManager and NPMS" into pi-dev
...
am: a26e755900
Change-Id: Ib0bd9ecc183b1b2c9a6785554e6f717744820da3
2018-04-11 18:39:53 -07:00
TreeHugger Robot
a26e755900
Merge "Add stats logging to ServiceManager and NPMS" into pi-dev
2018-04-12 01:13:07 +00:00
Android Build Merger (Role)
37c3f298c3
Merge "Merge "Add API to compute charge time remaining." into pi-dev am: ba6f173cb1 am: ec69f61cc4"
2018-04-12 01:11:03 +00:00
Michael Wright
afc4b2d969
Merge "Add API to compute charge time remaining." into pi-dev am: ba6f173cb1
...
am: ec69f61cc4
Change-Id: Ic383fb123232f0a69221bda7fa489922dd6a5218
2018-04-11 18:10:38 -07:00
Siyamed Sinir
7c4bdf34a8
Merge "Remove Linkify.addAsync functions"
2018-04-12 01:09:53 +00:00
Michael Wright
ec69f61cc4
Merge "Add API to compute charge time remaining." into pi-dev
...
am: ba6f173cb1
Change-Id: Ic2c23a0b22282a2bbea31ec004c58e2d686d2868
2018-04-11 17:56:45 -07:00
TreeHugger Robot
ba6f173cb1
Merge "Add API to compute charge time remaining." into pi-dev
2018-04-12 00:27:53 +00:00
Suprabh Shukla
b1d40ed244
Merge "Updating strings for activity interceptor dialog" into pi-dev am: 3e5b5076a2
...
am: 87615abce6
Change-Id: Ic33f14d23c84a7eb45fd7815873c7c94290b5f6c
2018-04-11 17:06:33 -07:00
Suprabh Shukla
87615abce6
Merge "Updating strings for activity interceptor dialog" into pi-dev
...
am: 3e5b5076a2
Change-Id: Ifedcc426f81670c705408f01638c69a761044dff
2018-04-11 16:54:52 -07:00
Jeff Sharkey
dcc615a028
Merge "APIs to disable data usage notifications." into pi-dev am: f0b9fbebc0
...
am: 568a972669
Change-Id: I8bfcf47c10e5f43f963fe012e98d0afd83630e64
2018-04-11 16:51:25 -07:00
TreeHugger Robot
3e5b5076a2
Merge "Updating strings for activity interceptor dialog" into pi-dev
2018-04-11 23:39:46 +00:00
Makoto Onuki
49392d335a
Add stats logging to ServiceManager and NPMS
...
ServiceManager:
- Do an event log every N getService() calls with total time spent
in getService().
where N = 100 for core UIDs and 200 for other apps.
- Do an event log if getService() takes longer than N ms.
where N = 10 for core UIDs and 50 for other apps.
... with some extra throttling.
NPMS:
- Do the basic "stats logger" log for updateNetworkEnabledNL() and
isUidNetworkingBlocked()
This CL also enhances StatsLogegr so it now can show the slowest call
and the max # of calls per-second.
Bug: 77853238
Test: Manual test:
- Insert a SIM card
- Set data limit
- toggle airplane mode
- toggle wifi
- toggle mobile data
Then
- "dumpsys netpolicy" and "dumpsys activity processes" and check the stats
- also check "adb logcat -b all | grep ' service_manager'"
Change-Id: I5789541063f95d0eac501189816c8604a4571ba0
2018-04-11 16:37:57 -07:00
Jeff Sharkey
568a972669
Merge "APIs to disable data usage notifications." into pi-dev
...
am: f0b9fbebc0
Change-Id: I7b5bd380f00b6e94da79f43b354ecfc52df3f8e4
2018-04-11 16:14:26 -07:00
Kweku Adams
052421faf3
Merge "Updating BatteryStats to account for Ambient Display sipper." into pi-dev am: 5d9498a62c
...
am: 0c41a17c1e
Change-Id: Ifa33707f1829c3d9f430693fdd45349fe9906417
2018-04-11 16:12:43 -07:00
TreeHugger Robot
f0b9fbebc0
Merge "APIs to disable data usage notifications." into pi-dev
2018-04-11 23:05:03 +00:00
Kweku Adams
0c41a17c1e
Merge "Updating BatteryStats to account for Ambient Display sipper." into pi-dev
...
am: 5d9498a62c
Change-Id: Id2a3bb41586790366a945946bbb3326a4c7de142
2018-04-11 15:55:01 -07:00
Mihai Popa
7cc01055f7
Merge "[Magnifier-39] Hide both handles on overlap" into pi-dev am: aeed443b5b
...
am: 2bcd41461e
Change-Id: I43c0ad4f2de9dc51ab783051e7cee0f69751f63c
2018-04-11 15:47:57 -07:00
Michael Wright
928167e044
Add API to compute charge time remaining.
...
This is so unbundled applications (e.g. dreams) can present a charge
time indicator that is in sync with the rest of the system.
Bug: 77919650
Test: manual
Change-Id: I7d62dea4fd49eb173b4f052a0fc36f4e7ce5b6bb
2018-04-11 23:47:31 +01:00
Chet Haase
a27a43ae51
Merge "Add targetSdk check around new LinearLayout weighted measure behavior" into pi-dev
...
am: f24335ec85
Change-Id: I6a3d25fc7b4c03be19847fa988f6119d1eb5e1bc
2018-04-11 15:38:23 -07:00
Mihai Popa
8218633841
Merge "Fix ripple effect for floating toolbar menu items" into pi-dev am: 6afcf2fb4d
...
am: 6c909a6681
Change-Id: I0e005a74068848ac535d5fa5dbbd3a241ac1f4c7
2018-04-11 15:37:40 -07:00
Mihai Popa
2bcd41461e
Merge "[Magnifier-39] Hide both handles on overlap" into pi-dev
...
am: aeed443b5b
Change-Id: I66773f70d0ec5ec4923215c3aa4b59894a1f2890
2018-04-11 15:33:51 -07:00
TreeHugger Robot
5d9498a62c
Merge "Updating BatteryStats to account for Ambient Display sipper." into pi-dev
2018-04-11 22:28:17 +00:00
Mihai Popa
6c909a6681
Merge "Fix ripple effect for floating toolbar menu items" into pi-dev
...
am: 6afcf2fb4d
Change-Id: Ic94b1ca619219268a1af233b61cc8df1f380c980
2018-04-11 15:27:59 -07:00
Chet Haase
f24335ec85
Merge "Add targetSdk check around new LinearLayout weighted measure behavior" into pi-dev
2018-04-11 22:17:44 +00:00
Mihai Popa
aeed443b5b
Merge "[Magnifier-39] Hide both handles on overlap" into pi-dev
2018-04-11 22:15:35 +00:00
Mihai Popa
6afcf2fb4d
Merge "Fix ripple effect for floating toolbar menu items" into pi-dev
2018-04-11 22:14:51 +00:00
Jeff Sharkey
0a5570d49d
APIs to disable data usage notifications.
...
Certain carriers have requested the ability to disable the warning,
limit, and rapid data usage notifications shown by the OS, so give
them that ability on a per-subId basis. (The notifications are still
enabled by default.)
Unhide NOT_CONGESTED to match setSubscriptionOverrideCongested().
Fix bug in getPrimarySubscriptionPlanLocked() to find the first
currently active plan; the first non-recurring plan may be no longer
active. Fix bug in SubscriptionPlan which allowed invalid negative
or zero-length Period objects.
Bug: 77851691, 77506882, 77662747
Test: atest com.android.server.NetworkPolicyManagerServiceTest
Test: atest android.telephony.cts.SubscriptionManagerTest
Exempt-From-Owner-Approval: SDK deadline, responding to API feedback
Change-Id: Ib6e6dbadd5022937c3f0661ab4b66aa617f0b5af
2018-04-11 22:07:40 +00:00
Julia Reynolds
19cb0d1af8
Merge "Show onboarding screen from dnd tile" into pi-dev am: b2943a864e
...
am: fa40267709
Change-Id: Ic764bb701db0e534b0a9b44019cd262e016857f1
2018-04-11 13:19:51 -07:00
Daniel Cashman
934b61ddcb
Merge "Add SigningInfo class to expose package signing details." into pi-dev am: 960a0c6c57
...
am: 63b447531e
Change-Id: Ie311660c339d1293c2b332dc4da0e865a1d21685
2018-04-11 13:07:50 -07:00
Yangster-mac
4006c96aa4
Merge "Trim the invalid uids and tags when reading uids/tags from chain." into pi-dev am: 9054656c20
...
am: 0b90c524cb
Change-Id: Iaf27e817a7b9fd024f643e6874da76e4bd5e194d
2018-04-11 13:01:02 -07:00
Julia Reynolds
fa40267709
Merge "Show onboarding screen from dnd tile" into pi-dev
...
am: b2943a864e
Change-Id: I38450b8983c6be32d0a5a7fca757eb031764c13a
2018-04-11 12:55: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
Daniel Cashman
63b447531e
Merge "Add SigningInfo class to expose package signing details." into pi-dev
...
am: 960a0c6c57
Change-Id: I512db4ad4f81da5cdd61bb2de5f3ed0e719379c1
2018-04-11 12:40:33 -07: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
Julia Reynolds
b2943a864e
Merge "Show onboarding screen from dnd tile" into pi-dev
2018-04-11 19:36:41 +00: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