OSDN Git Service
Chen Xu [Wed, 3 May 2017 16:47:09 +0000 (16:47 +0000)]
Merge "support locale change for notification channels" into oc-dev
am:
dd373a838d
Change-Id: I7773fb08018925589a271baccf35ce3d9cb3c7b7
Chen Xu [Wed, 3 May 2017 16:42:43 +0000 (16:42 +0000)]
Merge "support locale change for notification channels" into oc-dev
Wale Ogunwale [Wed, 3 May 2017 16:26:53 +0000 (16:26 +0000)]
Merge "Only allow AM to update display orientation based on app containers" into oc-dev
am:
9304756c28
Change-Id: I81df798a1f2897837c6adbc622ffa64766030a6a
Roozbeh Pournader [Wed, 3 May 2017 16:21:52 +0000 (16:21 +0000)]
Merge "Update unit tests for forward delete" into oc-dev
am:
995b4a2185
Change-Id: Idc9e02ae6c792194db32070557ad3921aceca49d
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
Julia Reynolds [Wed, 3 May 2017 15:46:07 +0000 (15:46 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev
am:
abfa176b45
Change-Id: I238c7b739ed7bf359804e9488cf13c27fbb21d2c
TreeHugger Robot [Wed, 3 May 2017 15:39:26 +0000 (15:39 +0000)]
Merge "Sorting and intrusiveness updates" into oc-dev
Bartosz Fabianowski [Wed, 3 May 2017 15:15:20 +0000 (15:15 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev
am:
c8ca16a85a
Change-Id: I3d9d26ce66c74c307cb9f2cd06537b2bb3a22487
TreeHugger Robot [Wed, 3 May 2017 15:10:10 +0000 (15:10 +0000)]
Merge "Add more explicit documentation for install reason" into oc-dev
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.
Johan Torås Halseth [Wed, 3 May 2017 14:02:11 +0000 (14:02 +0000)]
Merge "Increase timeout for ADB backup/restore of SharedStorage." into oc-dev
am:
3eafb6e2c6
Change-Id: I33cac59253e106423680c70d5f79d83402109afd
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
Adrian Roos [Wed, 3 May 2017 13:49:41 +0000 (13:49 +0000)]
Merge "DozePlugin: Remove" into oc-dev
am:
b2484f2258
Change-Id: Id660a1dcfd49aeb6f46285927696a822a8e8c8f9
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
Jorim Jaggi [Wed, 3 May 2017 13:21:52 +0000 (13:21 +0000)]
Merge "Fix lock contention: Call into power manager service from handler" into oc-dev
am:
251894b134
Change-Id: I63323963266b4194f61c8e6d6cc30a63f9af78eb
Geoffrey Pitsch [Wed, 3 May 2017 13:19:03 +0000 (13:19 +0000)]
Merge "Delete default channel for all apps targeting O." into oc-dev
am:
b9ee2d4677
Change-Id: Icef88789844286860a348fab200ec8169dabbe51
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
Abodunrinwa Toki [Wed, 3 May 2017 12:40:34 +0000 (12:40 +0000)]
Merge "Avoid classifying text mulitple times." into oc-dev
am:
d30044407e
Change-Id: Ie6b8c7e95e47c5e382d3f2dab505faee1c03a6e8
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
Andrei Stingaceanu [Wed, 3 May 2017 09:48:11 +0000 (09:48 +0000)]
Merge "Move text coretests to JUnit (1)" into oc-dev
am:
e0857a5800
Change-Id: I295b78a4397bb6409eef1963362b766c0ea78640
Andrei Stingaceanu [Wed, 3 May 2017 09:45:52 +0000 (09:45 +0000)]
Merge "Move text coretests to JUnit (2)" into oc-dev
am:
2b0d0671b8
Change-Id: I8f5457aacd79bdaf7be72f7cdc082d0c915f61c6
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:10:55 +0000 (08:10 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev
am:
e4f36952ab
Change-Id: I37102edeba93a4b18c943c16946b609f04c1f0eb
Nicolas Geoffray [Wed, 3 May 2017 08:04:28 +0000 (08:04 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev
Vladislav Kaznacheev [Wed, 3 May 2017 07:38:47 +0000 (07:38 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
am:
33f2b3b3b1
Change-Id: I212a872da24ea6e64a90e3339cfc9e68f2eaa933
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:30:05 +0000 (04:30 +0000)]
Merge "Updating network info state should return true." into oc-dev
am:
703a233b03
Change-Id: Ib8a36b3880b65ea333a93dc4bd3ab5bca66272e7
Sundeep Ghuman [Wed, 3 May 2017 04:24:38 +0000 (04:24 +0000)]
Merge "Updating network info state should return true." into oc-dev
Ruben Brunk [Wed, 3 May 2017 03:56:01 +0000 (03:56 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
am:
24f4743f92
Change-Id: I23f5fdf5b3584861818bc378b85f98fc2e33ebb8
TreeHugger Robot [Wed, 3 May 2017 03:48:19 +0000 (03:48 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
Ben Lin [Wed, 3 May 2017 02:30:29 +0000 (02:30 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
am:
d6bfaba59c
Change-Id: I807eaa3090e655fdc959a10fe2652c2f4d932b01
Ben Lin [Wed, 3 May 2017 02:25:03 +0000 (02:25 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
Daichi Hirono [Wed, 3 May 2017 02:18:52 +0000 (02:18 +0000)]
Merge "Don't add other's child as header or footer" into oc-dev
am:
9e37a2e419
Change-Id: I7377848132c5334f0becc640ea82255ff41dee7c
Todd Kennedy [Wed, 3 May 2017 02:12:28 +0000 (02:12 +0000)]
Merge "Optionally let the instant app into disambig" into oc-dev
am:
1f1d60c5a1
Change-Id: I78725fadab5bb7222f9d4528d21b22d881df45a1
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:54:08 +0000 (01:54 +0000)]
Merge "More work on issue #
36891897: Need to ensure foreground..." into oc-dev
am:
6ff7df502b
Change-Id: Ic7de70297ab0eae610aeb5c359da381264779d6b
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
Andrii Kulian [Wed, 3 May 2017 00:14:14 +0000 (00:14 +0000)]
Merge "Update ime touch exclude region for hosting display" into oc-dev
am:
40d0f86783
Change-Id: I20f2cbc97202417d57cd36aa37ebd85e4ec27bd6
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
Michael Wright [Wed, 3 May 2017 00:08:11 +0000 (00:08 +0000)]
Merge changes from topic 'frankenbuild' into oc-dev
am:
adb87ec50b
Change-Id: I5ede652c22717b2a986b6fd7608a97e6a3531fa0
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.
Makoto Onuki [Tue, 2 May 2017 23:57:45 +0000 (23:57 +0000)]
Merge "Add more information to WTF to investigate bug
37809561" into oc-dev
am:
e497b698d2
Change-Id: I0d5ace9d9b302e8f924d096fb245a81a3dfa8568
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
Wale Ogunwale [Tue, 2 May 2017 23:51:32 +0000 (23:51 +0000)]
Merge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev
am:
5772ffcb9f
Change-Id: Ia344564dd1a9f6221e0737691eb4e8c8b9e27310
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
Winson Chung [Tue, 2 May 2017 23:27:48 +0000 (23:27 +0000)]
Merge "Restoring old methods for compatibility." into oc-dev
am:
d6c190c8d2
Change-Id: I306a8520873eb76182f3b04617265f5bf662aaf8
Siddharth Ray [Tue, 2 May 2017 23:21:14 +0000 (23:21 +0000)]
Merge "Added Channel for Network Initiated Notifications" into oc-dev
am:
84ed81ed39
Change-Id: Idfc023f7e06242f778ec8530e61aab29143e9b31
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
Michael Wright [Tue, 2 May 2017 22:17:25 +0000 (22:17 +0000)]
Merge "O is API 26" into oc-dev
am:
074a67c116
Change-Id: Ie1d9b8ebb3b1c1693bbce5bf7f7d1f8c7159e54e
TreeHugger Robot [Tue, 2 May 2017 22:11:53 +0000 (22:11 +0000)]
Merge "O is API 26" into oc-dev
Michael Dooley [Tue, 2 May 2017 22:08:43 +0000 (22:08 +0000)]
Merge "Adding voicemail transcription state to the database" into oc-dev
am:
4794cbf574
Change-Id: I121f40cb64c546b0f6e140943d5a263ee05b05b4
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
Adrian Roos [Tue, 2 May 2017 21:21:24 +0000 (21:21 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons" am:
ed112e3c11 am:
7135f5d2e5
am:
6983178c59
Change-Id: I8c66710c1f64dc14899a019a36c046e9996058ba
Adrian Roos [Tue, 2 May 2017 21:14:20 +0000 (21:14 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons" am:
ed112e3c11
am:
7135f5d2e5
Change-Id: I2b807be9ff69796ccc3dde64fb215250d9690717
Adrian Roos [Tue, 2 May 2017 21:09:32 +0000 (21:09 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons"
am:
ed112e3c11
Change-Id: I60313cc9a4560fd8e8308108a4d878ab49fcbea1
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
Tyler Gunn [Tue, 2 May 2017 21:07:25 +0000 (21:07 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." am:
34e0a257d5 am:
a2ed986390
am:
4db9f6d393 -s ours
Change-Id: Ie7051d0b4de000a304e8762916187bd2208ce029
Evan Rosky [Tue, 2 May 2017 21:01:30 +0000 (21:01 +0000)]
Merge "Don't focus search user-specified views which are invisible" into oc-dev
am:
3b213ed438
Change-Id: I5a058c7024020e41ba8747c243d7209127cba19f
Adrian Roos [Tue, 2 May 2017 21:00:40 +0000 (21:00 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons"
Tyler Gunn [Tue, 2 May 2017 20:55:45 +0000 (20:55 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." am:
34e0a257d5
am:
a2ed986390
Change-Id: I438bacc7028fb2c385a6dd21a79172f145490f6d
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
Tyler Gunn [Tue, 2 May 2017 20:48:09 +0000 (20:48 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission."
am:
34e0a257d5
Change-Id: I4c996f0e2e3d56bb36231f765a0d1a4d15cc171c
Siddharth Ray [Mon, 1 May 2017 20:29:04 +0000 (13:29 -0700)]
Added Channel for Network Initiated Notifications
Bug=
37659896
Change-Id: I1c04a9455c320330efbcb92c352fc31b16ed8378
Tyler Gunn [Tue, 2 May 2017 20:36:37 +0000 (20:36 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission."
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:29:00 +0000 (20:29 +0000)]
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev
am:
5f0e436548
Change-Id: Icc1d09c16abc31d15a7ea5960ab1640ae265c31c
Wale Ogunwale [Tue, 2 May 2017 20:23:43 +0000 (20:23 +0000)]
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev
Abodunrinwa Toki [Tue, 2 May 2017 20:17:18 +0000 (20:17 +0000)]
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev
am:
3cb61255ab
Change-Id: Ie089ed63df8064798fa98a8a2378b81d09cf3b1c
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 [Tue, 2 May 2017 20:11:50 +0000 (20:11 +0000)]
Merge "Fix cancel when the same notification is enqueued twice." into oc-dev
am:
67ced6c08f
Change-Id: Iadde1ec051096176e68fbec5f0a3ce2acf3eb39b
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
Sudheer Shanka [Tue, 2 May 2017 20:04:57 +0000 (20:04 +0000)]
Merge "Add commandline option to update power-save-except-idle whitelist." into oc-dev
am:
89bc8b17d6
Change-Id: Id87f06d4e13059e2f258508bf31348aba85ca5a9
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
TreeHugger Robot [Tue, 2 May 2017 19:54:21 +0000 (19:54 +0000)]
Merge "Resolve merge conflicts of
ccc5b9bbd02a to oc-dev-plus-aosp" into oc-dev-plus-aosp
Yi Kong [Tue, 2 May 2017 19:49:25 +0000 (12:49 -0700)]
Resolve merge conflicts of
ccc5b9bbd02a to oc-dev-plus-aosp
Test: Build
Change-Id: I7d3d6bb4c436b2025a0293f9c6475855243f4dd9
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
Jean-Michel Trivi [Tue, 2 May 2017 19:24:43 +0000 (19:24 +0000)]
Merge "Message about audio stream deprecation as warning" into oc-dev
am:
dd8a71f4a9
Change-Id: I35b530efc40eb025b5e1b0fe757ed2e4ed6a33ac
Android Build Merger (Role) [Tue, 2 May 2017 19:20:28 +0000 (19:20 +0000)]
Merge "Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev am:
4ec5dd1d88" into oc-dev-plus-aosp
Winson Chung [Tue, 2 May 2017 19:19:15 +0000 (19:19 +0000)]
Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev
am:
4ec5dd1d88
Change-Id: I72050ea3a1a6d2345d1f511cad2f048b4224c63c
TreeHugger Robot [Tue, 2 May 2017 19:18:33 +0000 (19:18 +0000)]
Merge "RenderScript: IWYU" into oc-dev-plus-aosp