OSDN Git Service
Wale Ogunwale [Tue, 10 May 2016 00:56:01 +0000 (00:56 +0000)]
Merge "Fixed bug with pop-up window placement at the bottom in split-screen" into nyc-dev
am:
21bbc5a775
* commit '
21bbc5a775ea65318d1250b0406c2573128d285e':
Fixed bug with pop-up window placement at the bottom in split-screen
Change-Id: I03fa322474eb7884720a0ce4ace38c71d95f06e9
TreeHugger Robot [Tue, 10 May 2016 00:44:40 +0000 (00:44 +0000)]
Merge "Fixed bug with pop-up window placement at the bottom in split-screen" into nyc-dev
Carlos Valdivia [Tue, 10 May 2016 00:38:08 +0000 (00:38 +0000)]
Merge "[Security] Prevent malicious notifications from AMS." into nyc-dev
am:
c118e62076
* commit '
c118e62076c6defc39001c1618d566e20dda2574':
[Security] Prevent malicious notifications from AMS.
Change-Id: I55046f06652b37702f48d7e36b121e893e9ffe5f
Jeff Sharkey [Tue, 10 May 2016 00:32:06 +0000 (00:32 +0000)]
Merge "Fix package cleanup when parsed APK missing." into nyc-dev
am:
b3b7763d5d
* commit '
b3b7763d5d35f4e85f3c5245abb9ab526b0e4c23':
Fix package cleanup when parsed APK missing.
Change-Id: If387d9dc16358af03e95693e9794bfe6bbfa22b6
Carlos Valdivia [Tue, 10 May 2016 00:25:46 +0000 (00:25 +0000)]
Merge "[Security] Prevent malicious notifications from AMS." into nyc-dev
TreeHugger Robot [Tue, 10 May 2016 00:19:38 +0000 (00:19 +0000)]
Merge "Fix package cleanup when parsed APK missing." into nyc-dev
Selim Cinek [Mon, 9 May 2016 23:46:00 +0000 (23:46 +0000)]
Merge "Fixed an issue where clearing transient views could ANR" into nyc-dev
am:
b745a89c1f
* commit '
b745a89c1f1cec0bfc14c5cd3053b32b0ffc22fe':
Fixed an issue where clearing transient views could ANR
Change-Id: Ia38f5fc483078241124b92b1ab15a30b7544014f
Selim Cinek [Mon, 9 May 2016 23:33:14 +0000 (23:33 +0000)]
Merge "Fixed an issue where clearing transient views could ANR" into nyc-dev
Selim Cinek [Mon, 9 May 2016 23:29:12 +0000 (23:29 +0000)]
Merge "Fixed a crash with min-priority notifications in a group" into nyc-dev
am:
3e04c56432
* commit '
3e04c5643230cb9ac688f1367e19495509005637':
Fixed a crash with min-priority notifications in a group
Change-Id: I3167891563ba73c895ca41ed0cfead37c6601110
Selim Cinek [Mon, 9 May 2016 23:19:27 +0000 (23:19 +0000)]
Merge "Fixed a crash with min-priority notifications in a group" into nyc-dev
Selim Cinek [Mon, 9 May 2016 22:54:10 +0000 (18:54 -0400)]
Fixed an issue where clearing transient views could ANR
It could lead to an infinite loop because it was called on
the wrong view.
Change-Id: Ie8008114474eccf2c0a4b930a5299eb6be1247c1
Fixes:
28634521
Jeff Sharkey [Mon, 9 May 2016 22:51:08 +0000 (16:51 -0600)]
Fix package cleanup when parsed APK missing.
Recently the uninstall logic was changed to require a parsed APK to
succeed, but we need uninstall to succeed when the APK lives on an
ejected storage device.
To fix that case, create a fake parsed package with just enough
information for the delete to proceed.
Fix package movement bug that sent an invalid user ID to installd;
we need to explicitly ask for each user.
Bug:
28658206
Change-Id: Icf417661f07688c7523f0d082528adec2ac70cc6
Joe Onorato [Mon, 9 May 2016 22:17:08 +0000 (22:17 +0000)]
Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev
am:
3b25fd081d
* commit '
3b25fd081d6af21b16ab4b96ead70766b3d78d06':
Fix a couple bad links in the javadoc for android.os.health.
Change-Id: I27ccd973ff6a14387a11f19c30dcb5a3ae95b802
TreeHugger Robot [Mon, 9 May 2016 22:03:03 +0000 (22:03 +0000)]
Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev
Winson [Mon, 9 May 2016 21:49:56 +0000 (21:49 +0000)]
Merge "Fixing regression in call to showRecents()." into nyc-dev
am:
e981777f0e
* commit '
e981777f0e92f7e35d283a41c98f4d99e561c679':
Fixing regression in call to showRecents().
Change-Id: I8379d5f50fd30cf80e973109c8c3f9cb36bb0cc2
Paul Crowley [Mon, 9 May 2016 21:49:54 +0000 (21:49 +0000)]
Merge "Two phases to set the password for disk encryption" into nyc-dev
am:
9aa6bb5a4a
* commit '
9aa6bb5a4a8bd00a175e8a9c338b52bc24a162b4':
Two phases to set the password for disk encryption
Change-Id: Ic77d5608961b34993848fc71809a27001d919abc
Winson Chung [Mon, 9 May 2016 21:36:56 +0000 (21:36 +0000)]
Merge "Fixing regression in call to showRecents()." into nyc-dev
Paul Crowley [Mon, 9 May 2016 21:35:33 +0000 (21:35 +0000)]
Merge "Two phases to set the password for disk encryption" into nyc-dev
Chong Zhang [Mon, 9 May 2016 21:27:57 +0000 (21:27 +0000)]
Merge "Fix a flicker when opening app again quickly while it\'s exiting" into nyc-dev
am:
a806e8ab12
* commit '
a806e8ab1213ef420c9c0d541dbbe96a7d9f1472':
Fix a flicker when opening app again quickly while it's exiting
Change-Id: I936bcb7b7bd3610a7fb89c9ec51333be3d46506a
Chong Zhang [Mon, 9 May 2016 21:16:48 +0000 (21:16 +0000)]
Merge "Fix a flicker when opening app again quickly while it's exiting" into nyc-dev
Amith Yamasani [Mon, 9 May 2016 21:11:33 +0000 (21:11 +0000)]
Merge "Workaround for assist crash with multiwindow" into nyc-dev
am:
9fb0e97ecb
* commit '
9fb0e97ecb732585d3c8855b459fd1f8e52f7d2b':
Workaround for assist crash with multiwindow
Change-Id: Ia026329d903ed525990614f9b046bbed3579a96b
TreeHugger Robot [Mon, 9 May 2016 21:03:59 +0000 (21:03 +0000)]
Merge "Workaround for assist crash with multiwindow" into nyc-dev
Selim Cinek [Mon, 9 May 2016 20:54:44 +0000 (20:54 +0000)]
Merge "Fixed a concurrent modification crash" into nyc-dev
am:
f9f48ecd4c
* commit '
f9f48ecd4c59429550909c050a1317eca31b324f':
Fixed a concurrent modification crash
Change-Id: I776698ffa8378e634554674e29dccea486b6cb13
Selim Cinek [Mon, 9 May 2016 20:43:44 +0000 (20:43 +0000)]
Merge "Fixed a bug where notifications could become orphaned" into nyc-dev
am:
ed47cf23e8
* commit '
ed47cf23e89c8af296d69464ac04996fbd7ee9a9':
Fixed a bug where notifications could become orphaned
Change-Id: I39739574e87d758a5cffac5a51db075e6e782bcc
Sungsoo Lim [Mon, 9 May 2016 20:43:41 +0000 (20:43 +0000)]
Merge "MediaBrowser: Make support lib v23.x available in N release" into nyc-dev
am:
c3fc7d4038
* commit '
c3fc7d4038a21918e42efd99f4759e963e1489a3':
MediaBrowser: Make support lib v23.x available in N release
Change-Id: I2749788f07a78c7234825f0ad28d96c345731737
Selim Cinek [Mon, 9 May 2016 20:36:10 +0000 (16:36 -0400)]
Fixed a crash with min-priority notifications in a group
Those notifications could get into a group with higher priority
because they were autobundled or if the app said so.
This could lead to invisible views on the lockscreen and a crash
when this happened in an animated fashion.
The bug was triggering old code that wasn't needed anymore that
removed the viewstate.
Change-Id: Ic86c2f03d55f2e98e352cdbfbb3ca80d8e676765
Fixes:
28611831
Selim Cinek [Mon, 9 May 2016 20:42:52 +0000 (20:42 +0000)]
Merge "Fixed a concurrent modification crash" into nyc-dev
Winson [Mon, 9 May 2016 20:34:07 +0000 (13:34 -0700)]
Fixing regression in call to showRecents().
- Previously, the call was made to showRecents() which took a single
boolean to determine alt-tab state, and after the refactoring, it
no longer made the same call.
Bug:
28663474
Change-Id: I75fb793e56c9a094a4372d7157dbd0dd7ecdbda7
TreeHugger Robot [Mon, 9 May 2016 20:33:13 +0000 (20:33 +0000)]
Merge "Fixed a bug where notifications could become orphaned" into nyc-dev
Jae Seo [Mon, 9 May 2016 20:32:45 +0000 (20:32 +0000)]
Merge "MediaBrowser: Make support lib v23.x available in N release" into nyc-dev
Joe Onorato [Mon, 9 May 2016 20:31:00 +0000 (13:31 -0700)]
Fix a couple bad links in the javadoc for android.os.health.
Bug:
28295754
Change-Id: I3b21e204bec626e4d1c6fb8f07580c2854e364eb
Joe Onorato [Mon, 9 May 2016 20:16:56 +0000 (20:16 +0000)]
Merge changes I04301fbd,If6577602 into nyc-dev
am:
ac29617c6e
* commit '
ac29617c6e11085c9648d150a50c5daa15d65645':
Flesh out the docs for the android.os.health package.
Properly blame the correct uid for wakeup alarms that don't have a WorkSource.
Change-Id: I28bae3d984af6d19852fb63eda5fb21c1b6c98dd
Philip P. Moltmann [Mon, 9 May 2016 20:16:47 +0000 (20:16 +0000)]
Merge "Init MidiService once system user gets unlocked." into nyc-dev
am:
da08abed1e
* commit '
da08abed1e604238399bad02849c47c4d7447bf3':
Init MidiService once system user gets unlocked.
Change-Id: I6aa45702b4de90125c87bb5be280178e44416485
TreeHugger Robot [Mon, 9 May 2016 20:05:12 +0000 (20:05 +0000)]
Merge changes I04301fbd,If6577602 into nyc-dev
* changes:
Flesh out the docs for the android.os.health package.
Properly blame the correct uid for wakeup alarms that don't have a WorkSource.
Greg Kaiser [Mon, 9 May 2016 20:04:46 +0000 (20:04 +0000)]
Merge "ContextHub: Avoid reference leaks" into nyc-dev
am:
5ee41098b0
* commit '
5ee41098b0d36cce4f6cb690cbaafdffb4177e8f':
ContextHub: Avoid reference leaks
Change-Id: I7b8c1b5da46cdd1e6c1a294f338c6ace30b52ff6
Philip P. Moltmann [Mon, 9 May 2016 20:04:38 +0000 (20:04 +0000)]
Merge "Init MidiService once system user gets unlocked." into nyc-dev
Greg Kaiser [Mon, 9 May 2016 19:54:41 +0000 (19:54 +0000)]
Merge "ContextHub: Avoid reference leaks" into nyc-dev
Philip P. Moltmann [Mon, 9 May 2016 19:40:19 +0000 (12:40 -0700)]
Init MidiService once system user gets unlocked.
Bug:
28621670
Change-Id: I358aa8db6d1408c317f4ca66b4e5c5cbbcfe0826
Amith Yamasani [Mon, 9 May 2016 19:46:23 +0000 (12:46 -0700)]
Workaround for assist crash with multiwindow
Temporarily disable multiwindow assist until
Bug:
28348867
is fixed correctly.
Change-Id: Ia9d0fb5d4412e87aada90e8dcffe829b61221c6c
Mark Renouf [Mon, 9 May 2016 19:19:54 +0000 (19:19 +0000)]
Merge "Restore cursor in watch extract text view" into nyc-mr1-dev
Selim Cinek [Mon, 9 May 2016 19:16:01 +0000 (19:16 +0000)]
Merge "Fixed a bug where the statusbar could become empty" into nyc-dev
am:
319eecff96
* commit '
319eecff96a318fc5a6909c8aee3a57206d0ca74':
Fixed a bug where the statusbar could become empty
Change-Id: If64ffd2a77e5635b72a08bce806168d187c0b16a
Selim Cinek [Mon, 9 May 2016 19:15:58 +0000 (19:15 +0000)]
Merge "Fixed a bug where Notifications could overlap" into nyc-dev
am:
fa2dc63505
* commit '
fa2dc635052afa870629141dfcc7374fed5e9768':
Fixed a bug where Notifications could overlap
Change-Id: I2123a1e204d3b9aaac300a682cb1514d62ba101b
Selim Cinek [Mon, 9 May 2016 19:02:55 +0000 (19:02 +0000)]
Merge "Fixed a bug where the statusbar could become empty" into nyc-dev
Selim Cinek [Mon, 9 May 2016 19:02:31 +0000 (19:02 +0000)]
Merge "Fixed a bug where Notifications could overlap" into nyc-dev
Wale Ogunwale [Mon, 9 May 2016 18:27:58 +0000 (18:27 +0000)]
Merge "Don\'t include IME in app screenshot while in multi-window mode" into nyc-dev
am:
de5a7afc79
* commit '
de5a7afc7989ecef051635fdc9ae52a69870c026':
Don't include IME in app screenshot while in multi-window mode
Change-Id: I38856256a6da41e16c2433079f0476ee44b8faac
Wale Ogunwale [Mon, 9 May 2016 18:27:55 +0000 (18:27 +0000)]
Merge "Change ForcedResizableInfoActivity to handle config. changes" into nyc-dev
am:
8a111f5f20
* commit '
8a111f5f20fcfe6707aa7bf02fde4f876e5505eb':
Change ForcedResizableInfoActivity to handle config. changes
Change-Id: Ie5cf51c7eab84d1d4858bfabb0bf06bc94f4b633
Bill Yi [Mon, 9 May 2016 18:27:53 +0000 (18:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
2d8ef7fcd5 -s ours
* commit '
2d8ef7fcd52ad91ef23688d553a3d9396d589623':
Import translations. DO NOT MERGE
Change-Id: Ie11b9ebe87631a9af6e5a6f2229dc27039baef78
Chong Zhang [Mon, 9 May 2016 17:59:59 +0000 (10:59 -0700)]
Fix a flicker when opening app again quickly while it's exiting
If the app is waiting for an opening animation with a dummy placeholder,
we need to skip the surface placement (in addition to the animateLocked).
Also, when animating is changing from exiting to entering, the mAnimating
flag needs to be cleared until the new animation starts. This prevents the
surface placement to place it wrong before the new animaition starts.
bug:
28599295
bug:
27742244
Change-Id: I26f0ead80ee9993a6c766ae8686ab11d1729519c
TreeHugger Robot [Mon, 9 May 2016 18:22:28 +0000 (18:22 +0000)]
Merge "Don't include IME in app screenshot while in multi-window mode" into nyc-dev
TreeHugger Robot [Mon, 9 May 2016 18:22:14 +0000 (18:22 +0000)]
Merge "Change ForcedResizableInfoActivity to handle config. changes" into nyc-dev
Mark Renouf [Wed, 13 Apr 2016 23:17:25 +0000 (19:17 -0400)]
Restore cursor in watch extract text view
Removes cursorVisible=false
Bug:
28669867
Change-Id: Id3cbaf70548aae361c52815f02f2988abb9ebdf4
Greg Kaiser [Mon, 9 May 2016 17:23:56 +0000 (10:23 -0700)]
ContextHub: Avoid reference leaks
We were leaking references in each call to onMessageReceipt(),
leading us to eventually run out of references and crash. We
now delete our local references prior to leaving the function.
Also, since especially our message size can be quite large,
we put in logic to gracefully fail if the system is out of
memory.
In addition, we fix up reference leaks within
constructJContextHubInfo(). These were one-time leaks at
initialization, so not the root cause of our crash, but still
unnecessary leaks which are easily fixed.
Bug:
28655628
Change-Id: I3a3dc8e069c6c1810f3152872d8d8410e8ad0683
TreeHugger Robot [Mon, 9 May 2016 18:18:05 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Mon, 9 May 2016 18:17:49 +0000 (18:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Tyler Gunn [Mon, 9 May 2016 18:12:44 +0000 (18:12 +0000)]
Merge "Un-@hide multi-endpoint APIs." into nyc-mr1-dev
Julia Reynolds [Mon, 9 May 2016 18:09:39 +0000 (18:09 +0000)]
Merge "Autobundle all notifications; don\'t leave the most recent one free." into nyc-dev
am:
e3e8eeaa7f
* commit '
e3e8eeaa7f604eb1e1a815a8cc438476aa4447b3':
Autobundle all notifications; don't leave the most recent one free.
Change-Id: Icd9f2b865c3e46dccef3bfb0f23a3ebc3647c280
TreeHugger Robot [Mon, 9 May 2016 18:04:21 +0000 (18:04 +0000)]
Merge "Autobundle all notifications; don't leave the most recent one free." into nyc-dev
smain@google.com [Mon, 9 May 2016 17:43:50 +0000 (17:43 +0000)]
update the older redirects based on studio restructure (https://critique.corp.google.com/#review/
121836018) am:
f2f8dff6eb am:
d20d4c6cf3 am:
0d1bce5e5d
am:
0b0ad39b13
* commit '
0b0ad39b13be289a4e37fcabb77946aa6818caec':
update the older redirects based on studio restructure (https://critique.corp.google.com/#review/
121836018)
Change-Id: Ic4303d46b86986f6caaa92215ec910d871b116c3
smain@google.com [Mon, 9 May 2016 17:39:31 +0000 (17:39 +0000)]
update the older redirects based on studio restructure (https://critique.corp.google.com/#review/
121836018) am:
f2f8dff6eb am:
d20d4c6cf3
am:
0d1bce5e5d
* commit '
0d1bce5e5d3a0521466e8d12de792024325d8d91':
update the older redirects based on studio restructure (https://critique.corp.google.com/#review/
121836018)
Change-Id: Iae2be6e4c6428e46ff1317d35eb3e12f97c6a813
smain@google.com [Mon, 9 May 2016 17:34:45 +0000 (17:34 +0000)]
update the older redirects based on studio restructure (https://critique.corp.google.com/#review/
121836018) am:
f2f8dff6eb
am:
d20d4c6cf3
* commit '
d20d4c6cf3bc5891d2a63024b1c5ba3abf5ed77d':
update the older redirects based on studio restructure (https://critique.corp.google.com/#review/
121836018)
Change-Id: Ib717a1f84f3c32ba6ccb762d0b3ffba6a1bd37e0
Joe Onorato [Mon, 9 May 2016 17:31:41 +0000 (10:31 -0700)]
Flesh out the docs for the android.os.health package.
Bug:
28295754
Change-Id: I04301fbdbfb0708172adb4fd4b4a3658d5ea14eb
Joe Onorato [Mon, 9 May 2016 17:10:29 +0000 (10:10 -0700)]
Properly blame the correct uid for wakeup alarms that don't have a WorkSource.
It was setting the uid to -1, but BatteryStats should be tracking the actual uid.
Bug:
28637246
Change-Id: If6577602e3fe59a95b5cece4fc99e704ba43c03e
smain@google.com [Mon, 9 May 2016 17:30:33 +0000 (17:30 +0000)]
update the older redirects based on studio restructure (https://critique.corp.google.com/#review/
121836018)
am:
f2f8dff6eb
* commit '
f2f8dff6eb50e673b32b8f6bb3c181267997aefd':
update the older redirects based on studio restructure (https://critique.corp.google.com/#review/
121836018)
Change-Id: Ib906d725e2de7012ebd305d64e12fc434c16a5ca
smain@google.com [Mon, 9 May 2016 17:16:13 +0000 (10:16 -0700)]
update the older redirects based on studio restructure
(https://critique.corp.google.com/#review/
121836018)
Change-Id: I5c7cb01da2afe18885444c9bd6a3fc09526a42a8
Selim Cinek [Mon, 9 May 2016 17:12:40 +0000 (13:12 -0400)]
Fixed a concurrent modification crash
Because notifications could become isolated when
the group is suppressed it could lead to concurrent
modifications while looping.
Change-Id: Ifd4fe0cc24110455de0d3edf2da0be0773eb8c67
Fixes:
28652038
Selim Cinek [Sat, 7 May 2016 22:29:32 +0000 (18:29 -0400)]
Fixed a bug where notifications could become orphaned
When a child got set not be a heads up after it was already
removed (When for example it was clicked on shortly after
it got posted) then it got orphaned leading to bad bugs
like the next notification not being visible. This
could happen often with WhatsApp who set the head up flags
on the summary instead of the children.
Change-Id: I52c8f5d9bc50080e4ece530255236d36f998372e
Fixes:
28565942
Jaewan Kim [Mon, 9 May 2016 17:12:07 +0000 (17:12 +0000)]
Merge "Fix recents row blinking when PIP is focused" into nyc-dev
am:
ccb85eb411
* commit '
ccb85eb411f5df1c50e504d4acfc973e8cbb6835':
Fix recents row blinking when PIP is focused
Change-Id: I0ad552940e97fff6a00e9d3c6eeef3451e15c05f
Jaewan Kim [Mon, 9 May 2016 17:05:52 +0000 (17:05 +0000)]
Merge "Fix recents row blinking when PIP is focused" into nyc-dev
Youhan Wang [Mon, 9 May 2016 17:04:54 +0000 (17:04 +0000)]
Merge "Add getAidForApptype()." into nyc-mr1-dev
Jae Seo [Mon, 9 May 2016 16:51:35 +0000 (16:51 +0000)]
Merge "MediaRouter: Add more logs for debugging" into nyc-dev
am:
99aa441581
* commit '
99aa4415815fd906b93f5d5220762b94133cefef':
MediaRouter: Add more logs for debugging
Change-Id: I85e675c3e8c3a31e4c988413a549c13660c0ecd0
Jae Seo [Mon, 9 May 2016 16:39:50 +0000 (16:39 +0000)]
Merge "MediaRouter: Add more logs for debugging" into nyc-dev
Richard Uhler [Mon, 9 May 2016 16:02:10 +0000 (16:02 +0000)]
Merge "Hold a ClassLoader reference in NativeAllocationRegistry." into nyc-dev
am:
8e96faae78
* commit '
8e96faae783fe1850d66bf3fb01fbb4579662959':
Hold a ClassLoader reference in NativeAllocationRegistry.
Change-Id: I36b5b0572f99f77c909c4af7fdc3143fc05397dc
Richard Uhler [Mon, 9 May 2016 15:53:16 +0000 (15:53 +0000)]
Merge "Remove inconsistent \'cmd package compile\' documentation." into nyc-dev
am:
12f2984dbf
* commit '
12f2984dbf10e89124afd7bf8242f564e5a176aa':
Remove inconsistent 'cmd package compile' documentation.
Change-Id: I00eb70c24edb5338294d0d43abcd3bcdf2121ef0
Richard Uhler [Mon, 9 May 2016 15:50:29 +0000 (15:50 +0000)]
Merge "Hold a ClassLoader reference in NativeAllocationRegistry." into nyc-dev
Richard Uhler [Mon, 9 May 2016 15:48:45 +0000 (15:48 +0000)]
Merge "Remove inconsistent 'cmd package compile' documentation." into nyc-dev
smain@google.com [Mon, 9 May 2016 15:36:43 +0000 (15:36 +0000)]
update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/
121726749 am:
ab5bf95626 am:
1a8f9e3ca0 am:
5e42875297
am:
beb01ff874
* commit '
beb01ff8746bb3b16359f420e78bbd96026c61fb':
update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/
121726749
Change-Id: I20da7408b72736757f4f17fe0b7791b75452cc9c
smain@google.com [Mon, 9 May 2016 15:32:36 +0000 (15:32 +0000)]
update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/
121726749 am:
ab5bf95626 am:
1a8f9e3ca0
am:
5e42875297
* commit '
5e428752971f2e3dfc3fda73633fc346f50f2763':
update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/
121726749
Change-Id: I76513a274909a296589c1354dfc0551764390e72
smain@google.com [Mon, 9 May 2016 15:28:14 +0000 (15:28 +0000)]
update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/
121726749 am:
ab5bf95626
am:
1a8f9e3ca0
* commit '
1a8f9e3ca00fb4436710e34b1f7fb2259adc066f':
update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/
121726749
Change-Id: Id0d7cf68025c8f6b082ebfdec6c9727e963d6b9a
smain@google.com [Mon, 9 May 2016 15:23:51 +0000 (15:23 +0000)]
update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/
121726749
am:
ab5bf95626
* commit '
ab5bf95626850e97124b912ca2699fb164574186':
update redirects for /studio files for the restructure from this CL: https://critique.corp.google.com/#review/
121726749
Change-Id: I7524aa066efa4241c6a14d881b23dee0da8e2632
smain@google.com [Mon, 9 May 2016 15:08:57 +0000 (08:08 -0700)]
update redirects for /studio files for the restructure
from this CL: https://critique.corp.google.com/#review/
121726749
Change-Id: I2c06eb12267f11d69a1dbd6f1c96a7bf1ef4a61c
Alan Viverette [Mon, 9 May 2016 14:14:35 +0000 (14:14 +0000)]
Merge "Always mutate child when added to drawable container" into nyc-dev
am:
d1f686f5dc
* commit '
d1f686f5dcf33606cf1e83cf2f7b8e41f5bd9148':
Always mutate child when added to drawable container
Change-Id: Ief6bbd8ab12d2e92dfc3a742c2acbed221c35a51
Alan Viverette [Mon, 9 May 2016 14:14:33 +0000 (14:14 +0000)]
Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev
am:
d8c38b892b
* commit '
d8c38b892b86cc9cb94633b6f9d74126e2d53c60':
Cancel animation and jump to current state if not animating picker
Change-Id: I20684e1e974e1d5f8f6987ca9eac17d3da470763
Alan Viverette [Mon, 9 May 2016 14:06:51 +0000 (14:06 +0000)]
Merge "Always mutate child when added to drawable container" into nyc-dev
Alan Viverette [Mon, 9 May 2016 14:06:28 +0000 (14:06 +0000)]
Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev
Jason Monk [Mon, 9 May 2016 13:27:09 +0000 (13:27 +0000)]
Merge "QQS: Fix ripple clipping" into nyc-dev
am:
d4bdf9ca7c
* commit '
d4bdf9ca7c99fce6e4c40d2f572a3556abbdc7ce':
QQS: Fix ripple clipping
Change-Id: I1f86af0dfbff85b5a15ae6342f5990c0d729b03d
Jason Monk [Mon, 9 May 2016 13:20:18 +0000 (13:20 +0000)]
Merge "QQS: Fix ripple clipping" into nyc-dev
Bill Yi [Mon, 9 May 2016 13:17:33 +0000 (06:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I513904878092ec474a6580c933beb79adf0f50ff
Auto-generated-cl: translation import
Bill Yi [Mon, 9 May 2016 13:14:28 +0000 (06:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia3e265610e5f562a0acfe849e2c7473f2bd44594
Auto-generated-cl: translation import
bohu [Mon, 9 May 2016 01:37:42 +0000 (01:37 +0000)]
Merge "Ensure Netd Service is alive" into nyc-dev
am:
d521a6d146
* commit '
d521a6d1467a41ba20744f63dd70a40be0f35be0':
Ensure Netd Service is alive
Change-Id: I733966cdfbfeae1d5603bcbd175af5f7e3038a78
Bo Hu [Mon, 9 May 2016 01:32:15 +0000 (01:32 +0000)]
Merge "Ensure Netd Service is alive" into nyc-dev
bohu [Tue, 3 May 2016 22:58:01 +0000 (15:58 -0700)]
Ensure Netd Service is alive
At least on android TV emulator system image, the Netd
service could be null when the setDnsConfigurationForNetwork
is invoked.
bug:
28553503
Change-Id: If059495c8573ede287c4e9d8f343318d519fca7f
Carlos Valdivia [Sun, 8 May 2016 04:46:15 +0000 (21:46 -0700)]
[Security] Prevent malicious notifications from AMS.
There was a hole in the getAuthToken logic that allowed notifications
resulting from getAuthToken requests using notifyOnAuthFailure=true to
launch arbitrary activites on the device. This is because the
getAuthToken session overrode onResult (unlike addAccount, updateCreds,
or confirmCreds).
Bug:
13787929
Change-Id: Ife1d48835f48416c2f0690f1413a076b69215190
Wale Ogunwale [Sat, 7 May 2016 23:40:45 +0000 (16:40 -0700)]
Don't include IME in app screenshot while in multi-window mode
We don't screenshot the IME in multi-window mode because the frame
of the IME might not overlap with that of the app. E.g. IME target
app at the top in split-screen mode and the IME at the bottom
overlapping with the bottom app.
Bug:
28446505
Change-Id: Iae4f7eafa582779a4cf2aba3d83c4d9f76a4ccca
Wale Ogunwale [Sat, 7 May 2016 21:13:52 +0000 (14:13 -0700)]
Change ForcedResizableInfoActivity to handle config. changes
This created extra churn in the system during resize due to
the activity relaunching.
Bug:
28614747
Change-Id: I148b6fca3dad7e10c90085a04bccb99587397912
Jae Seo [Sat, 7 May 2016 21:09:43 +0000 (14:09 -0700)]
MediaRouter: Add more logs for debugging
Bug:
28517884
Change-Id: I325b407983e79a78701acfbfd8f109657f006846
Wale Ogunwale [Sat, 7 May 2016 19:41:22 +0000 (12:41 -0700)]
Fixed bug with pop-up window placement at the bottom in split-screen
WindowState.mInsetFrame is used to represent a temp. offset of a task
due to something like docked stack resizing or IME currently on screen.
In the case of pop-up windows (or any child window that wants to layout
in the parent frame) we were incorrectly setting the containing frame
because we were checking to see if the mInsetFrame wasn't empty. This
check isn't needed for child windows that want to layout in parent frame
because the parent frame will already have the mInsetFrame applied to
its frame which will automatically trickle down to the display and content
frame it forwards to its child windows to use.
Bug:
28389714
Change-Id: If89d40845a5a14aa60abcdedef2385b1fe7bfee3
Sungsoo Lim [Sat, 7 May 2016 07:30:05 +0000 (16:30 +0900)]
MediaBrowser: Make support lib v23.x available in N release
A workaround change for supporting support lib 23.x in N release.
This change should be reverted in some point before O release.
Bug:
28572934
Change-Id: I7e6afc0293688e425736bc93da0ea10233c07e9a
Jorim Jaggi [Sat, 7 May 2016 00:07:58 +0000 (00:07 +0000)]
Merge "Fix minimized state messup" into nyc-dev
am:
dce92891df
* commit '
dce92891df42d5ad8cdcb6ecade5b2801a14f090':
Fix minimized state messup
Change-Id: I8aba9be1767593da365c3192bfaa89821f8bf527
Chris Craik [Sat, 7 May 2016 00:02:50 +0000 (00:02 +0000)]
Merge "Reset transparent region when saving a surface" into nyc-dev
am:
52b952a296
* commit '
52b952a296b84283db9041de96e2ff408b221572':
Reset transparent region when saving a surface
Change-Id: Ida763eab76b258a5f454aa4249cbd7ce3a02c81a
TreeHugger Robot [Fri, 6 May 2016 23:58:27 +0000 (23:58 +0000)]
Merge "Fix minimized state messup" into nyc-dev