OSDN Git Service
TreeHugger Robot [Tue, 3 Jul 2018 18:08:03 +0000 (18:08 +0000)]
Merge "MediaPlayer2: move SubtitleData listener into EventCallback"
Andrew Zeng [Tue, 3 Jul 2018 17:44:41 +0000 (17:44 +0000)]
Merge "Keep track of all bound services."
TreeHugger Robot [Tue, 3 Jul 2018 17:42:25 +0000 (17:42 +0000)]
Merge "Bugreport: Fix SystemUI service from being dumped twice 1/2"
TreeHugger Robot [Tue, 3 Jul 2018 17:41:21 +0000 (17:41 +0000)]
Merge "Fix leak where system held onto slice providers"
Nick James [Tue, 3 Jul 2018 17:35:40 +0000 (17:35 +0000)]
Merge "Revert "Disable DND status change notification on watches.""
Jorim Jaggi [Thu, 28 Jun 2018 14:04:02 +0000 (16:04 +0200)]
Don't call updateInputWindow twice in relayoutWindow
Test: go/wm-smoke
Test: Inspect perf
Bug:
110464019
Change-Id: I1e59dd758444363d985eb10cdcedc8e01d036cdb
TreeHugger Robot [Tue, 3 Jul 2018 17:14:32 +0000 (17:14 +0000)]
Merge "Decrease delay to improve battery life"
Nick James [Tue, 3 Jul 2018 16:37:25 +0000 (16:37 +0000)]
Revert "Disable DND status change notification on watches."
This reverts commit
506417450ba4e3f4ca1366a6d9bdc27186ac44de.
Reason for revert: Looking for +2 from main Android team.
Change-Id: Ieae138d8a2acce814d6ddbef2545e319edd216fe
Jason Monk [Tue, 3 Jul 2018 15:08:32 +0000 (11:08 -0400)]
Fix leak where system held onto slice providers
Test: uiservicestests
Bug:
110985973
Change-Id: Ie8fab3c7b8c22d302825fb147d2c3468f9ae7172
Aaron Heuckroth [Tue, 3 Jul 2018 14:13:22 +0000 (14:13 +0000)]
Merge "Add more information to notifications dump."
TreeHugger Robot [Tue, 3 Jul 2018 12:35:46 +0000 (12:35 +0000)]
Merge "Hide windows even when AOD is off"
TreeHugger Robot [Tue, 3 Jul 2018 11:11:27 +0000 (11:11 +0000)]
Merge "Track max CPU and latency of binder calls"
Erik Kline [Tue, 3 Jul 2018 10:29:26 +0000 (03:29 -0700)]
Merge "Push DNS configuration on network validation" am:
ef941e192a am:
e3f76635f7
am:
f882e66f2b
Change-Id: I209c38fab7f05909e61731a348b1b1a2b35feab2
Erik Kline [Tue, 3 Jul 2018 10:19:32 +0000 (03:19 -0700)]
Merge "Push DNS configuration on network validation" am:
ef941e192a
am:
e3f76635f7
Change-Id: Ic2046e053faf58e2edf2824e01145c61a9f2991f
Erik Kline [Tue, 3 Jul 2018 10:09:16 +0000 (03:09 -0700)]
Merge "Push DNS configuration on network validation"
am:
ef941e192a
Change-Id: I5907831e5f5f1f3659580cc56e2e081cbe88b1cc
Treehugger Robot [Tue, 3 Jul 2018 09:03:35 +0000 (09:03 +0000)]
Merge "Push DNS configuration on network validation"
TreeHugger Robot [Tue, 3 Jul 2018 08:32:23 +0000 (08:32 +0000)]
Merge "Docs: generateKeyPair() can't be called from the main thread."
Jack Yu [Tue, 3 Jul 2018 08:30:03 +0000 (01:30 -0700)]
[automerger skipped] Merge "Reordered the params for network registration" am:
38f7576297 -s ours am:
d111501e8c
am:
bf633db476
Change-Id: I541fab7ad6203733e0452cb9b96f144be2fe8464
Jack Yu [Tue, 3 Jul 2018 08:21:06 +0000 (01:21 -0700)]
[automerger skipped] Merge "Reordered the params for network registration" am:
38f7576297 -s ours
am:
d111501e8c
Change-Id: I86db28ba40fbb73fe0b50f8e751740767d22300f
Jack Yu [Tue, 3 Jul 2018 08:12:03 +0000 (01:12 -0700)]
[automerger skipped] Merge "Reordered the params for network registration"
am:
38f7576297 -s ours
Change-Id: Ibbe9027176ff14eae912c794fb0724cdc32f4926
Erik Kline [Tue, 26 Jun 2018 09:53:43 +0000 (18:53 +0900)]
Push DNS configuration on network validation
Test: as follows
- built, flashed, booted
- runtest frameworks-net passes
- connected to captive portal network,
saw failed validation attempt (opportunistic),
passed portal, saw successful revalidation attempt
Bug:
64133961
Bug:
72344805
Bug:
109928338
Change-Id: I0471685c2234af8a8c7f5b2ad3205eb6e36333c5
TreeHugger Robot [Tue, 3 Jul 2018 02:26:16 +0000 (02:26 +0000)]
Merge "Add active admin app to power white list."
Carmen Jackson [Tue, 3 Jul 2018 02:02:23 +0000 (19:02 -0700)]
Merge "Add in-app tracepoints to TouchLatency app." am:
674fd12278 am:
b6d12b8bb1
am:
0ede701120
Change-Id: Iee202f3c645249109a7f27ba393bb41c50b6b9e8
Carmen Jackson [Tue, 3 Jul 2018 01:52:46 +0000 (18:52 -0700)]
Merge "Add in-app tracepoints to TouchLatency app." am:
674fd12278
am:
b6d12b8bb1
Change-Id: I719439a6323ef38f2f39cd578cc4700b9e70850c
TreeHugger Robot [Tue, 3 Jul 2018 01:18:15 +0000 (01:18 +0000)]
Merge "Add Feature Flag for Hearing Aid Profile"
Wei Jia [Sat, 23 Jun 2018 00:27:07 +0000 (17:27 -0700)]
MediaPlayer2: move SubtitleData listener into EventCallback
Rename onMediaTimeChanged to onMediaTimeDiscontinuity
Remove stop
Test: MediaPlayer2Test
Bug:
109928575
Change-Id: I7e81a3255360fe780f07d8478634a4a41935db8c
Carmen Jackson [Tue, 3 Jul 2018 00:57:29 +0000 (17:57 -0700)]
Merge "Add in-app tracepoints to TouchLatency app."
am:
674fd12278
Change-Id: I69a89ba6fac90a454a1d8befe9317af25979ccbf
SongFerngWang [Tue, 3 Jul 2018 00:26:14 +0000 (17:26 -0700)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev am:
9ccabdbc45
am:
c49d3b2e2f
Change-Id: I9b5f09a5f42c099d048ea5ac0a98a644514a1067
SongFerngWang [Tue, 3 Jul 2018 00:12:49 +0000 (17:12 -0700)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
am:
9ccabdbc45
Change-Id: I7517b64e87b43acff501afc858c8fad433d0ecfc
TreeHugger Robot [Tue, 3 Jul 2018 00:01:52 +0000 (00:01 +0000)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
Treehugger Robot [Mon, 2 Jul 2018 23:56:11 +0000 (23:56 +0000)]
Merge "Reordered the params for network registration"
TreeHugger Robot [Mon, 2 Jul 2018 23:42:54 +0000 (23:42 +0000)]
Merge "Add SHOW_SOURCE_PUSH_TO_TALK to indicate that the interaction service was invoked by a hardware button."
Treehugger Robot [Mon, 2 Jul 2018 23:39:21 +0000 (23:39 +0000)]
Merge "Add in-app tracepoints to TouchLatency app."
Nathan Harold [Mon, 2 Jul 2018 23:34:09 +0000 (16:34 -0700)]
Merge "Update Docstrings for CellSignalStrengthLte" am:
5e8a5d4b79 am:
0571b04c3a
am:
275d5a5cb0
Change-Id: I24a3ea3ee0114247b97812149740c8bd0ea3d954
TreeHugger Robot [Mon, 2 Jul 2018 23:19:22 +0000 (23:19 +0000)]
Merge "wifi.proto: Add metrics for failed SAR sensor reg"
Nathan Harold [Mon, 2 Jul 2018 23:17:52 +0000 (16:17 -0700)]
Merge "Update Docstrings for CellSignalStrengthLte" am:
5e8a5d4b79
am:
0571b04c3a
Change-Id: I52a3de4f89b3a59cb4f33263cb5838d37fb0a7fb
Nathan Harold [Mon, 2 Jul 2018 23:07:37 +0000 (16:07 -0700)]
Merge "Update Docstrings for CellSignalStrengthLte"
am:
5e8a5d4b79
Change-Id: Id41fb2ccdeaf43fcc62193c78c93f4ca765d2fa2
Lucas Dupin [Mon, 2 Jul 2018 20:15:23 +0000 (13:15 -0700)]
Hide windows even when AOD is off
AOD might be off but it can become visible when the user double taps
or lifts the phone. We should prepare the window manager for these
cases.
Test: turn AOD on and off, set screen lock to 'None', double tap display
Bug:
110938816
Change-Id: I6f2db86579d5b86a86fcd1a4515ee77c78460c9d
Ryan Mitchell [Mon, 2 Jul 2018 22:48:46 +0000 (22:48 +0000)]
Merge "AAPT2: Encode 4-byte strings in Modified UTF-8"
Jorim Jaggi [Mon, 2 Jul 2018 21:58:32 +0000 (14:58 -0700)]
Merge "Only use simple rects for cutout region" into pi-dev am:
4764921dcc
am:
b7dc212a61
Change-Id: I2af32c72ea859ff908fa30b5de1e722a99b28479
Jorim Jaggi [Mon, 2 Jul 2018 21:47:09 +0000 (14:47 -0700)]
Merge "Only use simple rects for cutout region" into pi-dev
am:
4764921dcc
Change-Id: Icfb41008189d5c01f90afd4992428433043b4c4e
Carmen Jackson [Thu, 28 Jun 2018 22:15:44 +0000 (15:15 -0700)]
Add in-app tracepoints to TouchLatency app.
Test: Traced the TouchLatency app and saw the added tracepoints.
Change-Id: I72ab8f88731e635f98831f045dddd086a05acc3b
Lucas Dupin [Tue, 26 Jun 2018 22:09:08 +0000 (15:09 -0700)]
Decrease delay to improve battery life
Arbitrary delays were introduced a while ago to deal with device
specific issues but these delays ended up affecting battery life
significantly. Although removing them completely isn't possible,
they can be reduced to more conservative values.
Test: cover prox. sensor multiple times with multiple durations
Fixes:
110902271
Change-Id: I2731fc7a5414f796e96a6c97959c395b10c32faa
Jorim Jaggi [Mon, 2 Jul 2018 21:35:50 +0000 (21:35 +0000)]
Merge "Only use simple rects for cutout region" into pi-dev
Vishnu Nair [Mon, 2 Jul 2018 21:29:31 +0000 (14:29 -0700)]
Bugreport: Fix SystemUI service from being dumped twice 1/2
Bug:
110490179
Fix:
110490179
Test: Manual test dumpsys activity
adb shell dumpsys activity service all-platform-non-critical
adb shell dumpsys activity service all-platform
adb shell dumpsys activity service
Take bugreport and check contents
Test: atest FrameworksCoreTests:DumpUtilsTest
Change-Id: I9173d3fa0cc3aaf42e3ab03e7e2892cf4188b13b
Ryan Mitchell [Wed, 27 Jun 2018 18:57:18 +0000 (11:57 -0700)]
AAPT2: Encode 4-byte strings in Modified UTF-8
Codepoints that are encoded to 4 bytes in UTF-8 are not allowed in
Modified UTF-8. They instead should be encoded as surrogate pairs in the
same way that CESU-8 allows for surrogate pairs. This will also cause 4
byte UTF-8 codes to be represented in 6 bytes.
Bug:
37140916
Test: aapt2_tests
Change-Id: I155dc24f166139d1d36a16bac088dcfcd59eb321
Andrew Zeng [Mon, 2 Jul 2018 21:14:03 +0000 (21:14 +0000)]
Merge "Add flag to disable sticky behaviour for battery saver."
TreeHugger Robot [Mon, 2 Jul 2018 21:10:45 +0000 (21:10 +0000)]
Merge "Fix: Pattern/Password should not be capitalized (master branch)"
Winson Chung [Mon, 2 Jul 2018 21:04:39 +0000 (21:04 +0000)]
Merge changes Ibae2de51,I1d6718d9
* changes:
Allow share/edit screenshot actions from lockscreen
Prevent clobbering of activity options bundle when merging
Lei Yu [Thu, 28 Jun 2018 21:06:29 +0000 (14:06 -0700)]
Add active admin app to power white list.
So user can't restrict it in settings app.
Bug:
110337989
Test: RunSettingsLibTests
Change-Id: Ie32dc8b2204369c9ca8f704436d5c988f76481ae
Nathan Harold [Mon, 2 Jul 2018 20:40:55 +0000 (20:40 +0000)]
Merge "Update Docstrings for CellSignalStrengthLte"
TreeHugger Robot [Mon, 2 Jul 2018 20:29:29 +0000 (20:29 +0000)]
Merge "Make getDimension's Javadoc say it returns px."
Aaron Heuckroth [Mon, 2 Jul 2018 18:58:33 +0000 (14:58 -0400)]
Add more information to notifications dump.
Test: Manual.
Change-Id: Idee77eae3d3a5f3631820c8292e78857c3807256
Fixes:
77551055
TreeHugger Robot [Mon, 2 Jul 2018 19:36:30 +0000 (19:36 +0000)]
Merge "Fix QS peek animation from ACTION_DOWN"
TreeHugger Robot [Mon, 2 Jul 2018 19:28:22 +0000 (19:28 +0000)]
Merge "Add a package declaration to RulesState"
Lucas Dupin [Mon, 2 Jul 2018 19:01:04 +0000 (12:01 -0700)]
[automerger skipped] Merge "Move charging indication vertically on time tick" into pi-dev am:
5baaf461a6
am:
a9cd9d475b -s ours
Change-Id: I740c9a64e364ad33bdbd5622a845b0d14c5777d5
Lucas Dupin [Mon, 2 Jul 2018 18:50:37 +0000 (11:50 -0700)]
Merge "Move charging indication vertically on time tick" into pi-dev
am:
5baaf461a6
Change-Id: I455c53bf85fd7fcfe87daef6d76888a37fecb015
TreeHugger Robot [Mon, 2 Jul 2018 18:39:55 +0000 (18:39 +0000)]
Merge "Move charging indication vertically on time tick" into pi-dev
Makoto Onuki [Mon, 2 Jul 2018 18:32:09 +0000 (18:32 +0000)]
Merge "Fix BatterySaverStateMachineTest"
Andrew Zeng [Thu, 28 Jun 2018 22:15:05 +0000 (15:15 -0700)]
Keep track of all bound services.
When a service is disconnected mServices will be updated
to no longer contain the service binding. In order to
prevent an accidental double-bind for services bound directly
in ManagedServices due to not detecting a service is still bound,
make sure that if the service is still bound that we don't rebind.
Bug:
77821801
Test: atest FrameworksUiServicesTests:ManagedServicesTest
Test: manual - check service bound after force-stop/app update
Test: manual - check service not re-bound after disabling a component
Change-Id: Id600357ad0b84f157cf9666680bf53b7fe125d96
(cherry picked from commit
d814134e9ee652de5b54c7c20c8eb3c1a8f590df)
TreeHugger Robot [Mon, 2 Jul 2018 17:58:20 +0000 (17:58 +0000)]
Merge "Make sure keys get flushed when connection falls apart."
Lucas Dupin [Wed, 27 Jun 2018 18:44:57 +0000 (11:44 -0700)]
Move charging indication vertically on time tick
Before, a new translation was only calculated when the device enters
AOD, and then, during time tick, we would only move it 5px wich isn't
enough.
Now, the translation varies 5dps vertically on every time tick.
Fixes:
110888643
Test: take screenshots for N minutes and compare them
Change-Id: Ia3f239d669b83aad0d97d8d7a7f7374f4890777d
Merged-In: Ia3f239d669b83aad0d97d8d7a7f7374f4890777d
TreeHugger Robot [Mon, 2 Jul 2018 17:37:29 +0000 (17:37 +0000)]
Merge "Move charging indication vertically on time tick"
TreeHugger Robot [Mon, 2 Jul 2018 17:30:22 +0000 (17:30 +0000)]
Merge "Add more data (fg services, associations) to procstats."
TreeHugger Robot [Mon, 2 Jul 2018 17:02:20 +0000 (17:02 +0000)]
Merge "Allow 0sp text size in xml for TextView"
Makoto Onuki [Mon, 2 Jul 2018 16:24:38 +0000 (16:24 +0000)]
Merge "Improve "dumpsys activity lastanr-traces"."
Jorim Jaggi [Thu, 28 Jun 2018 23:14:31 +0000 (01:14 +0200)]
Only use simple rects for cutout region
Otherwise there is a big performance hit in all kinds of
situations where we do operations with the region, specifically
when:
- updating input windows
- insetting the cutout during layout
- touch dispatch
Test: DisplayCutoutTest, WmDisplayCutoutTest
Bug:
110464019
Bug:
110452325
Change-Id: I94a25c3794ecd33b8b7204ca308ac91623498f13
Olivier Gaillard [Mon, 4 Jun 2018 13:14:04 +0000 (14:14 +0100)]
Track max CPU and latency of binder calls
Test: unit tested
Change-Id: I1429e8c34e9cb0572975fda3ec18e85d6caf3cad
TreeHugger Robot [Mon, 2 Jul 2018 14:31:31 +0000 (14:31 +0000)]
Merge "Only play in-call notification if ringer is normal"
TreeHugger Robot [Mon, 2 Jul 2018 14:21:24 +0000 (14:21 +0000)]
Merge "Add a debug property to enable Skia systrace"
Sehee Park [Mon, 2 Jul 2018 13:55:33 +0000 (06:55 -0700)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called." am:
ccd6a0f6c2 am:
c7b925063f
am:
48396e8616
Change-Id: Idb98c57e8e1791eefdf47f9127696211a4ff3a99
Sehee Park [Mon, 2 Jul 2018 13:46:09 +0000 (06:46 -0700)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called." am:
ccd6a0f6c2
am:
c7b925063f
Change-Id: Ia160a4cf42e427575a70810d7157e092e47b5992
Stan Iliev [Fri, 29 Jun 2018 19:16:11 +0000 (15:16 -0400)]
Add a debug property to enable Skia systrace
Add a "debug.hwui.skia_atrace_enabled" property that allows to
record a systrace with skia drawing ops. App need to be restarted
after setting the new propety to true.
Test: collected skia trace with systemui
Change-Id: I2d1c5911714bfc911894f633ec2df2f6bb953b48
Sehee Park [Mon, 2 Jul 2018 13:23:35 +0000 (06:23 -0700)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called."
am:
ccd6a0f6c2
Change-Id: I9842ae51d3bb4665f5cb24b7685a05de2df05097
Mihai Popa [Fri, 29 Jun 2018 12:42:44 +0000 (13:42 +0100)]
Allow 0sp text size in xml for TextView
Before this CL, when TextView's textSize attribute was set to 0sp in
XML, the text would still be visible on the screen, as the actual
textSize set was non zero. On the other hand, if the text size was set
to 0sp programmatically, the text would not be visible. This was a P
regression, as on O the text would be invisible in both cases.
This CL fixes the attribute reading stage in TextView, allowing the
application of a 0 text size on the view.
Bug:
110251171
Test: atest CtsWidgetTestCases:android.widget.cts.TextViewTest
Change-Id: I3798361e182f45a67cd0a69d40e09e559375aa20
Treehugger Robot [Mon, 2 Jul 2018 11:22:28 +0000 (11:22 +0000)]
Merge "Modify catch when addInterfaceToLocalNetwork() is called."
Sehee Park [Tue, 19 Jun 2018 11:07:37 +0000 (20:07 +0900)]
Modify catch when addInterfaceToLocalNetwork() is called.
Fatal Exception is occured in system process. Becuase addInterfaceToLocalNetwork()
throw IllegalStateException but it can not be handled in TetherInterfaceStateMachine.
Modify catch from "RemoteException" to "Exception" when addInterfaceToLocalNetwork() is called.
Test: Repeat on/off tethering
Test: "runtest --no-hidden-api-checks frameworks-net" passes
Bug:
110396460
Change-Id: I2f2f1325cfcce40c3113ccccf69b2bbd5df4ae5b
Signed-off-by: Sehee Park <sehee32.park@samsung.com>
TreeHugger Robot [Sat, 30 Jun 2018 22:04:26 +0000 (22:04 +0000)]
Merge "StrictMode to catch storage while locked."
Jeff Sharkey [Sat, 30 Jun 2018 21:02:54 +0000 (21:02 +0000)]
Merge "Get android.os tests running against real APIs."
SongFerng Wang [Sat, 30 Jun 2018 06:42:32 +0000 (23:42 -0700)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev am:
d7b5946628
am:
fce00ebc0a
Change-Id: I346193114b57f7eb1e06cc3b013eff0ada806f5c
SongFerng Wang [Sat, 30 Jun 2018 06:34:15 +0000 (23:34 -0700)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
am:
d7b5946628
Change-Id: I7f11346be248bd325f14d7039f5a5d5b2f45617a
SongFerng Wang [Sat, 30 Jun 2018 06:22:12 +0000 (06:22 +0000)]
Merge "add three new carrier configs for call forwarding, Caller ID and Call Waiting." into pi-dev
Kevin Chyn [Sat, 30 Jun 2018 02:22:29 +0000 (02:22 +0000)]
Merge "Add face metrics constants"
Android Build Merger (Role) [Sat, 30 Jun 2018 01:51:02 +0000 (01:51 +0000)]
Merge "[automerger skipped] Merge "Used APN type instead of APN id" am:
2e371c1b5a am:
a916542011 am:
8f76322f75 -s ours"
TreeHugger Robot [Sat, 30 Jun 2018 01:50:19 +0000 (01:50 +0000)]
Merge "Fix a NPE in BatteryStatsImpl"
Jack Yu [Sat, 30 Jun 2018 01:50:17 +0000 (18:50 -0700)]
[automerger skipped] Merge "Used APN type instead of APN id" am:
2e371c1b5a am:
a916542011
am:
8f76322f75 -s ours
Change-Id: Id0bb6219082d66ca62db3fc7908e3643b1108739
Jack Yu [Sat, 30 Jun 2018 01:40:06 +0000 (18:40 -0700)]
Merge "Used APN type instead of APN id" am:
2e371c1b5a
am:
a916542011
Change-Id: I58bb518a7720e65edd73d93b5775fa4cc40b41db
SongFerngWang [Thu, 28 Jun 2018 09:28:22 +0000 (17:28 +0800)]
add three new carrier configs for call forwarding, Caller ID and Call Waiting.
The carrier configs control the call forwarding and additional
settings button in the Call Settings menu and caller ID and
call waiting in additional settings menu.
Bug:
110121209
Test: manual - test case as below :
1.flag clir on and flag cw on ,do CLIR show/hide,
and make call to other device.(PASS)
2.flag clir on and flag cw on ,do CW on/off,and CW function work.(PASS)
3.flag clir off and flag cw on ,no CLIR in additional settings page(PASS)
4.flag clir off and flag cw on ,do CW on/off,and CW function work.(PASS)
5.flag clir on and flag cw off ,do CLIR show/hide ,
and make call to other device.(PASS)
6.flag clir on and flag cw off ,no CW in additional settings page(PASS)
7.flag clir off and flag cw off,
no Additional Settings in call feature settings(PASS)
8.flag cf off,no cf in call settings page (PASS)
Change-Id: I29d7a71ad57b3b05ccc6025154f63119b35dab71
Jack Yu [Sat, 30 Jun 2018 01:06:39 +0000 (18:06 -0700)]
Merge "Used APN type instead of APN id"
am:
2e371c1b5a
Change-Id: Ib920746cb39937165aa97f79a9ac4e2fed850572
Kevin Chyn [Sat, 30 Jun 2018 00:56:32 +0000 (00:56 +0000)]
Merge "FaceManager removal callback should propagate remaining"
TreeHugger Robot [Sat, 30 Jun 2018 00:54:26 +0000 (00:54 +0000)]
Merge "Fix the memory leak in BatteryStatsImpl.Timebase.mObservers."
Winson Chung [Fri, 29 Jun 2018 19:26:49 +0000 (12:26 -0700)]
Allow share/edit screenshot actions from lockscreen
- Dismiss keyguard when routing the actions through the proxy receiver
- Fix issue with edit activity also disallowing auto-enter PiP
- Minor cleanup of some unused/shared code
Bug:
72459081
Test: Launch share/edit screenshot from lockscreen (and normally)
Test: Launch screenshot share action with auto-enter PiP activity and
ensure it does not trigger PiP
Change-Id: Ibae2de51bc3fe10f439d7506ab7d0d9243142c94
Winson Chung [Fri, 29 Jun 2018 17:16:53 +0000 (10:16 -0700)]
Prevent clobbering of activity options bundle when merging
- RemoteViews specify an ActivityOptions when calling startIntentSender()
(for click handling), but if the PendingIntent being started also has an
ActivityOptions, the merging of the two options will fail since the
ActivityOptions properties are always written into the bundle (regardless
of whether they are actually set). Instead, only write non-default
values to the bundle (the defaults will be read out if not set when
restoring the options from the bundle anyways).
Bug:
72459081
Test: atest FrameworksServicesTests:ActivityOptionsTest
change-id: i1d6718d9db4b3f7056412c5b4c5347a19ffa7c09
TreeHugger Robot [Sat, 30 Jun 2018 00:26:35 +0000 (00:26 +0000)]
Merge "Make scroll bars more noticeable on round screens."
TreeHugger Robot [Sat, 30 Jun 2018 00:21:40 +0000 (00:21 +0000)]
Merge "Moved more stuff from ActivityManagerService to ActivityTaskManagerService (11/n)"
Mike Ma [Fri, 29 Jun 2018 19:18:27 +0000 (12:18 -0700)]
Fix a NPE in BatteryStatsImpl
ServiceManager.getService("batteryproperties")) may return null for some
devices right after boot. (We don't know why, need further investigation)
This causes async batterystats update to crash, leaving BatteryStats in a
bad state (OnBattery() == true, but mOnBatteryTimeBase is not running),
which does not accept aggregated stats update anymore.
Bug:
109930230
Test: manual
Change-Id: I0654beff95f0a2b9df2567f1a2efffd3330e58ff
Jack Yu [Fri, 29 Jun 2018 23:54:32 +0000 (23:54 +0000)]
Merge "Used APN type instead of APN id"
Wale Ogunwale [Wed, 27 Jun 2018 12:14:34 +0000 (05:14 -0700)]
Moved more stuff from ActivityManagerService to ActivityTaskManagerService (11/n)
Moved more stuff related to activities out of the current service to the new one.
Bug:
80414790
Fixes:
110988007
Test: Existing tests pass.
Change-Id: Iceed1da8a7441a26d11efebc6d9f692fd053bc7f
Danny Epstein [Fri, 29 Jun 2018 23:21:03 +0000 (16:21 -0700)]
Make getDimension's Javadoc say it returns px.
Bug:
24467193
Test: Only changed Javadoc.
Change-Id: I209d8ddbe025ec2c35668ddaac2bdba79305ec6a
Jeff Sharkey [Fri, 29 Jun 2018 23:15:40 +0000 (17:15 -0600)]
Get android.os tests running against real APIs.
Combination of moving to existing public API, tagging things as
@TestApi, and bringing utility methods into tests.
Bug:
13282254
Test: atest cts/tests/tests/os/
Change-Id: Ifd24c0d048d200e8595e194890cc1dc53ddc2b3e