OSDN Git Service
TreeHugger Robot [Wed, 3 May 2017 23:16:10 +0000 (23:16 +0000)]
Merge "Removed deprecated ViewStructure.setUrl() method." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 22:57:07 +0000 (22:57 +0000)]
Merge changes from topic 'allow_none_scorer' into oc-dev
* changes:
Revert permission check on setActiveScorer.
Allow the active scorer to be set to NULL.
Randy Pan [Wed, 3 May 2017 22:55:44 +0000 (22:55 +0000)]
Merge "Add network disabled reason starting index" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 22:39:04 +0000 (22:39 +0000)]
Merge "Add compatibility matrices to VintfObject.report()" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 22:38:23 +0000 (22:38 +0000)]
Merge "Make all FrameBuilderTests run on RT" into oc-dev
Fyodor Kupolov [Wed, 3 May 2017 22:15:23 +0000 (22:15 +0000)]
Merge "Use timeout for *dexopt* wake lock" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 21:22:44 +0000 (21:22 +0000)]
Merge "Fix Array Index out of bounds error." into oc-dev
Adrian Roos [Wed, 3 May 2017 21:11:36 +0000 (21:11 +0000)]
Merge "Notification: Remove actions from public view" into oc-dev
Fyodor Kupolov [Wed, 3 May 2017 20:59:04 +0000 (20:59 +0000)]
Merge "Prevent NPE in startActivityUnchecked" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 20:54:27 +0000 (20:54 +0000)]
Merge "Send AutofillValue of Views that originated a forced request." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 20:21:39 +0000 (20:21 +0000)]
Merge "AOD: Pass through pulse reason to DozeUi" into oc-dev
Chris Tate [Wed, 3 May 2017 20:15:49 +0000 (20:15 +0000)]
Merge "Don't mix "current dataset" tokens for different backup transports" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 19:50:53 +0000 (19:50 +0000)]
Merge "Fix Wakelock underlock in GnssLocationProvider." into oc-dev
Wei Wang [Wed, 3 May 2017 19:45:14 +0000 (19:45 +0000)]
Merge "Fix RttManager documation unit issue." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 19:04:29 +0000 (19:04 +0000)]
Merge "Fix QS visibility logs missing some info" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 18:49:14 +0000 (18:49 +0000)]
Merge "TextClassifier: Append to url intents that need one." into oc-dev
Narayan Kamath [Wed, 3 May 2017 18:03:03 +0000 (18:03 +0000)]
Merge "preloaded-classes: Add android.text.Html$HtmlParser" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 18:02:49 +0000 (18:02 +0000)]
Merge "Only remove task if activity fails to start." into oc-dev
Rob Carr [Wed, 3 May 2017 18:01:11 +0000 (18:01 +0000)]
Merge "Respect Z-ordering when assigning fullscreen-dim layer." into oc-dev
Chris Craik [Wed, 3 May 2017 17:53:16 +0000 (10:53 -0700)]
Make all FrameBuilderTests run on RT
Fixes:
33834637
Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests --gtest_filter=FrameBuilder.renderNode_OpenGL
Test: adb shell /data/nativetest/hwui_unit_tests/hwui_unit_tests --gtest_filter=FrameBuilder.projection*
They essentially all use Caches, so making RT-only for safety. This
prevents crashes when trying to access Caches in a non-rt test, when
it's not guaranteed to be created.
Change-Id: I530c73d0ffe2d4f4ef53a46715f5bcca2c485f70
Yifan Hong [Tue, 2 May 2017 01:43:36 +0000 (18:43 -0700)]
Add compatibility matrices to VintfObject.report()
Test: FrameworksCoreTests
Bug:
36814503
Change-Id: I27eaea136437afb2102581d410b657e810612a0a
TreeHugger Robot [Wed, 3 May 2017 17:29:16 +0000 (17:29 +0000)]
Merge "Fix snapshots for secure windows" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 17:08:21 +0000 (17:08 +0000)]
Merge "Set sensor-supplied orientation always to portrait in VrMode." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 17:02:10 +0000 (17:02 +0000)]
Merge "Night display status restores on reboot/user change" into oc-dev
Julia Reynolds [Wed, 3 May 2017 16:50:27 +0000 (16:50 +0000)]
Merge "Treat apps that use channels as O apps" into oc-dev
Chen Xu [Wed, 3 May 2017 16:42:43 +0000 (16:42 +0000)]
Merge "support locale change for notification channels" into oc-dev
Fyodor Kupolov [Wed, 3 May 2017 16:30:19 +0000 (09:30 -0700)]
Prevent NPE in startActivityUnchecked
Test: manual
Bug:
37931794
Change-Id: I4a968e12cfa99d347f19a8cf2a3b9fba1bf1715b
TreeHugger Robot [Wed, 3 May 2017 16:21:36 +0000 (16:21 +0000)]
Merge "Only allow AM to update display orientation based on app containers" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 16:13:10 +0000 (16:13 +0000)]
Merge "Update unit tests for forward delete" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 15:39:26 +0000 (15:39 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev
Jorim Jaggi [Wed, 3 May 2017 13:21:26 +0000 (15:21 +0200)]
Fix snapshots for secure windows
First, also draw system bar backgrounds when drawing a fake
snapshot. For that, refactor the drawing into a separate class so
it can be reused. Also enable fake snapshots for secure windows.
Test: com.android.server.wm.TaskSnapshotControllerTest
Test: com.android.server.wm.TaskSnapshotSurfaceTest
Test: Secure activity with resuming delay, make sure system bars
are covered when reopening app.
Bug:
35710126
Change-Id: I2f0ebc7e7acb80015780a4e882f0a472599efa30
TreeHugger Robot [Wed, 3 May 2017 15:10:10 +0000 (15:10 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev
Christine Franks [Sat, 11 Feb 2017 01:36:10 +0000 (17:36 -0800)]
Night display status restores on reboot/user change
Fixes:
30086742
Test: runtest -c com.android.server.NightDisplayServiceTest \
frameworks-services
Change-Id: I264be077e607baf8e19496f0c57549a907668005
Jason Monk [Wed, 3 May 2017 14:37:34 +0000 (10:37 -0400)]
Fix QS visibility logs missing some info
Test: runtest systemui
Change-Id: I6deb71576b137dfbd51f863e88ad939d4f3fab1b
Fixes:
35454347
Julia Reynolds [Mon, 1 May 2017 13:20:30 +0000 (09:20 -0400)]
Treat apps that use channels as O apps
... even if they don't target O
- Delete misc channel
- Read settings from channel instead of notification
Test: runtest systemui-notification
Change-Id: I00814959eddd10998806dd67cc30421091ae9aab
Fixes:
37540996
Fixes:
35378789
Wale Ogunwale [Tue, 2 May 2017 21:49:04 +0000 (14:49 -0700)]
Only allow AM to update display orientation based on app containers
Activity manager choregraphs several app states when starting an
activity including when the display orientation should be updated based
on the app that is now in the foreground. It is possible for a call to
originate within WM after AM adds the starting app token, but before AM
makes the app visible and resumed. E.g. A relayout call due to a
starting window. When this happens WM can prematurely update the display
orientation with incomplete information causing the starting app to be
in an incorrect orientation initially.
To fix this problem we now only factor in app containers (stacks, task,
..) when updating the display orientation if the call to update is
coming from AM. Otherwise we only use the non-app/system containers to
determine the orientation or return the last orientation.
Change-Id: I431ce9260ee31257732311a548c62cbcdb27eae7
Fixes:
37550022
Test: Launch 2 apps that don't fix orientation and use the recent button
to switch between them while holding the device in landscape.
TreeHugger Robot [Wed, 3 May 2017 13:55:49 +0000 (13:55 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
Julia Reynolds [Tue, 2 May 2017 19:04:34 +0000 (15:04 -0400)]
Sorting and intrusiveness updates
- The intrusiveness extractor needs to know about channels
- Allow comparisons by contact affinity even in the min bucket.
Test: cts-verifier, attention management test
Bug:
36197567
Change-Id: I1bb53d758fc2334aad5e380620fc6e39a724195c
TreeHugger Robot [Wed, 3 May 2017 13:43:14 +0000 (13:43 +0000)]
Merge "DozePlugin: Remove" into oc-dev
Bartosz Fabianowski [Tue, 18 Apr 2017 12:39:23 +0000 (14:39 +0200)]
Add more explicit documentation for install reason
This CL adds more explicit documentation of the install reason argument /
return value to PackageInstaller.SessionInfo.
Bug:
37324584
Test: None
Change-Id: I2450cc669b194e611c5dc07c6a0a5cd78a98c039
TreeHugger Robot [Wed, 3 May 2017 13:16:27 +0000 (13:16 +0000)]
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
Geoffrey Pitsch [Wed, 3 May 2017 13:15:16 +0000 (13:15 +0000)]
Merge "Delete default channel for all apps targeting O." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 12:35:17 +0000 (12:35 +0000)]
Merge "Avoid classifying text mulitple times." into oc-dev
Johan Torås Halseth [Wed, 26 Apr 2017 20:20:32 +0000 (21:20 +0100)]
Increase timeout for ADB backup/restore of SharedStorage.
It previously used a backup timeout of 5 min, and restore timeout of 1
min, that would always timeout if the files on shared storage were big.
Now increase both to 60 minutes.
Bug:
37201952
Test: adb backup -shared && adb restore backup.ab
Merged-In: Ice6648554933baf76e96fd151b506564487c91c6
Change-Id: I99095249e960fd47fc742154bc513347bf506548
Jorim Jaggi [Tue, 2 May 2017 16:02:46 +0000 (18:02 +0200)]
Fix lock contention: Call into power manager service from handler
Make sure to not hold the wm lock when calling into power manager
service, because PWM will acquire a lock that might be contended.
Test: Make sure user activity timeout is still respected on
Keyguard
Test: Have activity with screenBrightness=1.0, make sure screen
is fully bright when opened
Bug:
37888898
Bug:
36631902
Change-Id: I4b5433dbaf8aa151465ae32232d3b3b8597715df
Narayan Kamath [Wed, 3 May 2017 09:39:29 +0000 (10:39 +0100)]
preloaded-classes: Add android.text.Html$HtmlParser
This class creates a singleton HTMLSchema instance in <clinit> and
we want this done in the zygote. HTMLSchema.<init> is too large for
the compiler and can allocate ~100k of objects on the heap. This also
saves ~50ms in the execution of Html.fromHtml on a lightly loaded
marlin-userdebug.
Test: manual
Bug:
36678451
Change-Id: Icdd3af35018bbe283b3e3690c696e6517452165d
TreeHugger Robot [Wed, 3 May 2017 09:42:01 +0000 (09:42 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 09:41:30 +0000 (09:41 +0000)]
Merge "Move text coretests to JUnit (2)" into oc-dev
Nicolas Geoffray [Wed, 3 May 2017 08:04:28 +0000 (08:04 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 07:31:44 +0000 (07:31 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
Sundeep Ghuman [Wed, 3 May 2017 04:24:38 +0000 (04:24 +0000)]
Merge "Updating network info state should return true." into oc-dev
TreeHugger Robot [Wed, 3 May 2017 03:48:19 +0000 (03:48 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
Wei Wang [Tue, 2 May 2017 03:24:19 +0000 (20:24 -0700)]
Fix Wakelock underlock in GnssLocationProvider.
Added a separate wakelock for xtra download so it won't
interfer with any wakelocks.
Test: manual
Bug:
37545729
Change-Id: I0867166f03802d1ed133437bcd85b0062db69947
Wei Wang [Wed, 3 May 2017 03:30:28 +0000 (20:30 -0700)]
Fix RttManager documation unit issue.
Bug:
35138520
Test: Build passes. Nothing else to test as this only changes javadocs.
Change-Id: Id522eba4cf8dba2be670582e7d734bd9203b2aae
Ben Lin [Wed, 3 May 2017 02:25:03 +0000 (02:25 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
Adrian Roos [Wed, 3 May 2017 01:54:40 +0000 (18:54 -0700)]
Notification: Remove actions from public view
Change-Id: I9d95e2ea3ff89110f58f6d5585771ad301494e41
Test: Turn on "hide sensitive notifications on lockscreen", receive notification, make sure it has no actions
Fixes:
37907366
TreeHugger Robot [Wed, 3 May 2017 02:12:03 +0000 (02:12 +0000)]
Merge "Don't add other's child as header or footer" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 02:06:29 +0000 (02:06 +0000)]
Merge "Optionally let the instant app into disambig" into oc-dev
Dianne Hackborn [Wed, 3 May 2017 01:46:25 +0000 (01:46 +0000)]
Merge "More work on issue #
36891897: Need to ensure foreground..." into oc-dev
Roozbeh Pournader [Wed, 3 May 2017 01:33:12 +0000 (18:33 -0700)]
Update unit tests for forward delete
Changes in the definition of grapheme boundaries for emoji (which
now relies more on what actually ligates in a font) need updating the
unit tests. The changes in the unit tests are cases where the old
code in Minikin assumed a single grapheme, but the new code looks in
the font and finds that there are two grapheme clusters indeed.
Change-Id: Icd3d2563776fb295f48e70b67a8af8e6bd3f4b38
Fixes:
37769578
Test: updated tests pass
fionaxu [Tue, 2 May 2017 22:56:58 +0000 (15:56 -0700)]
support locale change for notification channels
Bug:
37911731
Test: Manual test with different languages
Change-Id: I36ce985dfc8fdb0f6c2b8b20c411b63099942f44
Sundeep Ghuman [Fri, 21 Apr 2017 04:25:41 +0000 (21:25 -0700)]
Updating network info state should return true.
Update AccessPoint.java so that network state changes return updated
equals true, so that corresponding UI elements will updated
appropriately.
Bug: b/
37289220
Test: runtest --path
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I1bc74997227b46468ef11efbf183a95ec0d2b15f
Ruben Brunk [Mon, 1 May 2017 23:57:31 +0000 (16:57 -0700)]
Fix Bluetooth GATT API default handler assignment
Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.
This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.
Bug:
37544152
Bug:
37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9
Todd Kennedy [Wed, 26 Apr 2017 19:58:28 +0000 (12:58 -0700)]
Optionally let the instant app into disambig
When a user clicks "view on web", it's not assumed this is meant to be
forever. In this case, we will adjust the instant app's verification
status so that the instant isn't automatically run.
Change-Id: I246de901dafb23159a064d205fdb614d657a99dc
Fixes:
37686922
Test: Manual
Test: 1) Install instant app
Test: 2) Set to always-ask -- adb shell pm set-app-link package.name always-ask
Test: 3) Notice that we get a disambig w/ the instant app and chrome as options
Test: 4) Set to never -- adb shell pm set-app-link package.name never
Test: 5) Notice that we don't get the instant app
Andrii Kulian [Wed, 3 May 2017 00:03:25 +0000 (00:03 +0000)]
Merge "Update ime touch exclude region for hosting display" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 23:59:46 +0000 (23:59 +0000)]
Merge changes from topic 'frankenbuild' into oc-dev
* changes:
Revert "Resource ID fixup."
Resource ID fixup.
TreeHugger Robot [Tue, 2 May 2017 23:51:33 +0000 (23:51 +0000)]
Merge "Add more information to WTF to investigate bug
37809561" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 23:41:26 +0000 (23:41 +0000)]
Merge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev
Sundeep Ghuman [Tue, 2 May 2017 22:58:39 +0000 (15:58 -0700)]
Fix Array Index out of bounds error.
This error was caused by concurrent modification of the
mPendingNotifications SparseIntArray which fell outside the
synchronization block in copyAndNotifyListeners. Now the entire
copyAndNotifyListeners is synchronized on mLock.
Bug: b/
37775443
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: I19e8a4ecea5cd45122f4ca89f8ed959e500c951a
Winson Chung [Tue, 2 May 2017 23:19:24 +0000 (23:19 +0000)]
Merge "Restoring old methods for compatibility." into oc-dev
Siddharth Ray [Tue, 2 May 2017 23:13:01 +0000 (23:13 +0000)]
Merge "Added Channel for Network Initiated Notifications" into oc-dev
Winson Chung [Tue, 2 May 2017 22:14:23 +0000 (15:14 -0700)]
Restoring old methods for compatibility.
Bug:
37637423
Test: Build and test PIP apps
Change-Id: I9ccb49a3e42de55a249ab54bde2f3c5a1c179c1c
TreeHugger Robot [Tue, 2 May 2017 22:11:53 +0000 (22:11 +0000)]
Merge "O is API 26" into oc-dev
Fyodor Kupolov [Tue, 2 May 2017 19:11:02 +0000 (12:11 -0700)]
Use timeout for *dexopt* wake lock
There are reports of *dexopt* lock being held for 10+ minutes, which shouldn't
normally happen on threads that are monitored by the Watchdog. Added
logging to help detecting that.
The lock is now held with a timeout of WAKELOCK_TIMEOUT_MS. It is set to a
higher value than PM's watchdog timeout for easier reading from a timing
histogram.
Test: Manual, device boots without errors
Bug:
37756892
Change-Id: Iac569474d1c95447e08fe5e9870e4518b8d22c65
Robert Carr [Tue, 2 May 2017 22:00:50 +0000 (15:00 -0700)]
Respect Z-ordering when assigning fullscreen-dim layer.
As an optimization, we use a shared fullscreen dim layer for multiple
users. We need to be careful to look at the Z-order of various users
when choosing who to assign it to.
Bug:
36415615
Test: Ask assistant question, long press power, assistant should be dimmed.
Change-Id: Ifea94fe33d32236b79800c0e7c543aac52c8b69f
Wale Ogunwale [Tue, 2 May 2017 04:32:58 +0000 (21:32 -0700)]
Skip Pip animation to fullscreen if orientation is going to change
Having this kind of animation look good is extremely difficult.
The best we can do is skip the animation and just go to fullscreen
if we know the device orientation is going to change because the
current screen configuration isn't compatible with the fixed
orientation requested by the app going fullscreen.
Change-Id: I97b14723a0d678c05efedc93fe692ad3b3212a72
Fixes:
37722472
Test: manual
Michael Dooley [Tue, 2 May 2017 22:01:12 +0000 (22:01 +0000)]
Merge "Adding voicemail transcription state to the database" into oc-dev
Winson Chung [Tue, 2 May 2017 21:40:33 +0000 (14:40 -0700)]
Only remove task if activity fails to start.
Bug:
37501224
Test: Start activity, go home, start activity again
Change-Id: Ic10183ad1af2e588ad342b0fd8ea4ad0b45adf1d
Abodunrinwa Toki [Tue, 2 May 2017 20:43:41 +0000 (21:43 +0100)]
TextClassifier: Append to url intents that need one.
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Bug:
36504599
Change-Id: I5008225a6a3df2d8e07e4a9ae0e340a6582f9e7b
Andrii Kulian [Tue, 2 May 2017 20:22:42 +0000 (13:22 -0700)]
Update ime touch exclude region for hosting display
If IME for an application is situated on a different display,
then we need to update corresponding display content's touch
exclude region.
Bug:
36515606
Test: Manual, b/
37911363
Change-Id: I43785de6f26adf88e9a76b9144b39f66f232a646
Felipe Leme [Tue, 2 May 2017 20:53:15 +0000 (13:53 -0700)]
Send AutofillValue of Views that originated a forced request.
Bug:
36034784
Test: CtsAutoFillServiceTestCases pass
Test: LoginActivityTest.testAutofillManuallyPartialField()
Change-Id: I79970f236f0ae3caaff60acc19ab8a08c3cb2ef4
Evan Rosky [Tue, 2 May 2017 20:54:00 +0000 (20:54 +0000)]
Merge "Don't focus search user-specified views which are invisible" into oc-dev
Siddharth Ray [Mon, 1 May 2017 20:29:04 +0000 (13:29 -0700)]
Added Channel for Network Initiated Notifications
Bug=
37659896
Change-Id: I1c04a9455c320330efbcb92c352fc31b16ed8378
Michael Wright [Tue, 2 May 2017 20:35:28 +0000 (21:35 +0100)]
Revert "Resource ID fixup."
This reverts commit
e6d161554f4cb84a6a5410b2b7e9ed5348bdf96d.
Bug:
37480230
Test: build
Change-Id: I2322c34132c5c8761d7506b00b2a8cdd286a5e48
Michael Wright [Tue, 2 May 2017 19:00:10 +0000 (20:00 +0100)]
Resource ID fixup.
Remove unused resources and assign IDs to the remaining ones.
Bug:
37480230
Test: build
Change-Id: Ife792e38ae1b7b2bf6b176a52929bc3e1fa16060
Ben Lin [Tue, 2 May 2017 20:32:27 +0000 (13:32 -0700)]
Remove snippet regarding ContentProvider#notifyChange in documentation.
For ContentProvider and DocumentsProvider, throwing an exception in
their query methods will result in no Cursor returned to the remote
side. Without a cursor, there is no way to listen in on changes.
Removing the part regarding notifyChange since there's no established
paradigm on which URI to listen/notify changes on.
Test: Documentation change only.
Bug:
37876119
Change-Id: I0739794a1e8182918758ba953251ed9a3268f227
Wale Ogunwale [Tue, 2 May 2017 20:23:43 +0000 (20:23 +0000)]
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev
Wale Ogunwale [Tue, 2 May 2017 20:16:39 +0000 (13:16 -0700)]
Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays
Reduce pre-submit noise. We can re-enable once we figure-out why it
is flaky.
Bug:
37908381
Test: disabled!
Change-Id: Ia82ba73fafafc433487027f2ee2d582dceb65ed2
Geoffrey Pitsch [Mon, 17 Apr 2017 15:33:24 +0000 (11:33 -0400)]
Delete default channel for all apps targeting O.
Change toast to be for debuggable builds only.
Bug:
35378789
Test: runtest systemui-notification
Change-Id: I36247b003ead00bf1f9f3bed9c1a38a53db18c71
TreeHugger Robot [Tue, 2 May 2017 20:05:42 +0000 (20:05 +0000)]
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev
TreeHugger Robot [Tue, 2 May 2017 20:02:13 +0000 (20:02 +0000)]
Merge "Fix cancel when the same notification is enqueued twice." into oc-dev
Sudheer Shanka [Tue, 2 May 2017 19:56:59 +0000 (19:56 +0000)]
Merge "Add commandline option to update power-save-except-idle whitelist." into oc-dev
Abodunrinwa Toki [Tue, 2 May 2017 19:32:23 +0000 (20:32 +0100)]
Avoid classifying text mulitple times.
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Bug:
34966796
Change-Id: I278dc5f1ca684ff0f336c05f14f5b42196738ba7
Jeremy Joslin [Fri, 28 Apr 2017 20:08:17 +0000 (13:08 -0700)]
Revert permission check on setActiveScorer.
Reverted to the pre-O behavior of allowing the call if the caller
has the SCORE_NETWORKS permission.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
37722313
Change-Id: I54a99dde364d6a5c88d35072922020542c6ae003
Jeremy Joslin [Thu, 27 Apr 2017 20:32:49 +0000 (13:32 -0700)]
Allow the active scorer to be set to NULL.
Setting the scorer to NULL will disable scoring/recommendations.
Test: runtest frameworks-services -c com.android.server.NetworkScorerAppManagerTest
Bug:
37722313
Change-Id: I8bdc43aa80cc2d6668ffa24389a8e4e9aaf95bd6
TreeHugger Robot [Tue, 2 May 2017 19:13:19 +0000 (19:13 +0000)]
Merge "Message about audio stream deprecation as warning" into oc-dev
Adrian Roos [Fri, 28 Apr 2017 22:52:24 +0000 (15:52 -0700)]
DozePlugin: Remove
The DozePlugin has not been able to keep up with the changes to DozeMachine.
At this point it is cleaner to just remove it.
Bug:
30876804
Test: make SystemUI
Change-Id: Ie8cd1488eb862017c54b92b1fba07537c0143bff
Winson Chung [Tue, 2 May 2017 19:07:24 +0000 (19:07 +0000)]
Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev
Calin Juravle [Tue, 2 May 2017 19:03:18 +0000 (19:03 +0000)]
Merge "Make PM#notifyDexLoad oneway" into oc-dev
Makoto Onuki [Tue, 2 May 2017 19:02:23 +0000 (12:02 -0700)]
Add more information to WTF to investigate bug
37809561
Bug
37809561
Test: Build & boot -- didn't actually exercise the WTF case but it should work
since getStackTraceString accepts null too.
Change-Id: Iabfbe1fcde293fec919c65df7ea9650e1b247b9a