OSDN Git Service
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
Greg Kaiser [Mon, 9 May 2016 19:54:41 +0000 (19:54 +0000)]
Merge "ContextHub: Avoid reference leaks" into nyc-dev
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
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
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
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
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
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
TreeHugger Robot [Fri, 6 May 2016 23:42:32 +0000 (23:42 +0000)]
Merge "Reset transparent region when saving a surface" into nyc-dev
Felipe Leme [Fri, 6 May 2016 23:39:09 +0000 (23:39 +0000)]
Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev
am:
638a6e8140
* commit '
638a6e8140a22a0ddb5d5dacb02173795073bd1a':
Fixed connectivity state in some restricted network scenarios.
Change-Id: I5d3fdbbff6d92be9657d3ed466462ca911d20881
TreeHugger Robot [Fri, 6 May 2016 23:25:27 +0000 (23:25 +0000)]
Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev
Svetoslav Ganov [Fri, 6 May 2016 23:17:52 +0000 (23:17 +0000)]
Merge "Properly map runtime permissions to app ops" into nyc-dev
am:
ba83e90e18
* commit '
ba83e90e1825f3e40a16370babc83b8ac0645cf9':
Properly map runtime permissions to app ops
Change-Id: Ie4830b140c2589abecbe8e6f575ab939d9c988ce
Svetoslav Ganov [Fri, 6 May 2016 23:08:30 +0000 (23:08 +0000)]
Merge "Properly map runtime permissions to app ops" into nyc-dev
Andrii Kulian [Fri, 6 May 2016 22:52:44 +0000 (22:52 +0000)]
Merge "Fix onStop not called when activity is under translucent" into nyc-dev
am:
a5aa3ecbe3
* commit '
a5aa3ecbe3426b44b6d550624e7b30f4b84c1025':
Fix onStop not called when activity is under translucent
Change-Id: I863e28ef8884e3c6e629c1b2c30c554fb0538988
Jorim Jaggi [Fri, 6 May 2016 22:45:00 +0000 (15:45 -0700)]
Fix minimized state messup
We didn't dispatch the change, but still set the field. This lead to
issues where SysUI disagreed on the minimized state. To fix this, we
only check for state changes if the docked stack is visible, but then
dispatch the change always.
Bug:
28445644
Change-Id: Ie460135049c78e11c97f3160994ca4069bf82e6c
Andrii Kulian [Fri, 6 May 2016 22:44:18 +0000 (22:44 +0000)]
Merge "Fix onStop not called when activity is under translucent" into nyc-dev
Steve McKay [Fri, 6 May 2016 22:22:41 +0000 (22:22 +0000)]
Merge "Don\'t persist selection after restore." into nyc-dev
am:
522a437786
* commit '
522a4377863339d9486c833f5a39f8047576bfee':
Don't persist selection after restore.
Change-Id: Idee08d4397212a2a2a58b650ebcaa3b162b73aab
Chris Craik [Fri, 6 May 2016 20:39:08 +0000 (13:39 -0700)]
Reset transparent region when saving a surface
Fixes:
28432088
Ensure a transparent region on a saved surface is reset for future use,
since the surface should be like-new if used again.
This prevents an issue where the region - used to signal a portion of
content doesn't need to be composited - is persisted when a saved
surface is reused. The client assumes it's new and in default
state (composite everything), but the window is clipped when composited.
Change-Id: Icf2ec94c735679d715aded58de7eab12e9c43367
TreeHugger Robot [Fri, 6 May 2016 22:11:12 +0000 (22:11 +0000)]
Merge "Don't persist selection after restore." into nyc-dev
Felipe Leme [Fri, 6 May 2016 21:53:54 +0000 (21:53 +0000)]
Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev
am:
de66540fd3
* commit '
de66540fd3f73937c3cfbe1d50e575aa69acc474':
Refactored NetworkPolicyManagerService mUidRules.
Change-Id: I89af2823e8d791a487917daafe16be6764c231b2
Felipe Leme [Fri, 6 May 2016 21:53:50 +0000 (14:53 -0700)]
Fixed connectivity state in some restricted network scenarios.
NetworkPolicyManagerService (NMPS) keeps an internal list of uid
rules (mUidRules) for network restrictions, and when these rules
changes it needs to notify external listeners (such as
ConnectivityService / CS).
Prior to Android N, both Data Saver mode (the feature previously known
as "Restrict Baground Data") and Battery Save mode used the same set of
firewall rules to implement their restrictions: when Battery Saver mode
NPMS would mark all networks as metered and set the proper firewall
rules externally.
Recently, these 2 modes were split in 2 distinct firewall rules and
NMPS.updateRuleForRestrictBackgroundLocked() was changed to update
the mUidRules logic based on the Data Saver firewall (since the Battery
Saver firewall changes are handled externally, on
updateRuleForRestrictPowerLocked()). As such, CS was not notified when
the power-related changes were made, which would cause apps to get a
state of CONNECTED / CONNECTED when querying its active connection.
Another scenario that is not properly handled is when a UID whitelisted
for Data Saver is brought back to foreground: although the proper
firewall rules are set, CS is not notified, and the apps state would be
DISCONNECTED / BLOCKED.
This CL introduces many changes that fix this issue:
- Fixed updateRuleForRestrictBackgroundLocked() to invoke
onUidRulesChanged() when the Battery Saver status changed.
- Fixed updateRuleForRestrictBackgroundLocked() to invoke
onUidRulesChanged() when an app whitelisted for Data Saver is brought
back to the foreground.
- Added a new API (onRestrictPowerChanged() and getRestrictPower())
to notify external services about Battery Saver mode changes.
- Fixed CS logic to properly handle the Battery Saver changes.
Externally to this change, the CTS tests were also improved to verify
the apps get the proper connection state; they can be verified running:
cts-tradefed run commandAndExit cts -m CtsHostsideNetworkTests \
-t com.android.cts.net.HostsideRestrictBackgroundNetworkTests
BUG:
28521946
Change-Id: I8eaccd39968eb4b8c6b34f462fbc541e5daf55f1
Christopher Tate [Fri, 6 May 2016 21:42:47 +0000 (21:42 +0000)]
Merge "Move the \'pretend idle jobs can run now\' broadcast into AMS" into nyc-dev
am:
0588954071
* commit '
058895407140de0e513b82150c3acb6131e971a2':
Move the 'pretend idle jobs can run now' broadcast into AMS
Change-Id: Ia97d382761fc8b9f2c11729cd027a2d8c6c9379b
TreeHugger Robot [Fri, 6 May 2016 21:41:38 +0000 (21:41 +0000)]
Merge "Refactored NetworkPolicyManagerService mUidRules." into nyc-dev
Chris Tate [Fri, 6 May 2016 21:34:50 +0000 (21:34 +0000)]
Merge "Move the 'pretend idle jobs can run now' broadcast into AMS" into nyc-dev
Sid Soundararajan [Fri, 6 May 2016 21:28:45 +0000 (21:28 +0000)]
Merge "Reset Cards as they come into view" into nyc-dev
am:
4fd98d1f09
* commit '
4fd98d1f0996783ae5d9520315c02983c68c41f9':
Reset Cards as they come into view
Change-Id: Ib659edbd4c5d7875fb1210cae895ea94c842ee63
Sid Soundararajan [Fri, 6 May 2016 21:16:54 +0000 (21:16 +0000)]
Merge "Reset Cards as they come into view" into nyc-dev
Pavlin Radoslavov [Fri, 6 May 2016 21:08:14 +0000 (21:08 +0000)]
Merge "Fix divergent equals and hashCode behavior" into nyc-dev
am:
2ff5780d90
* commit '
2ff5780d903bb052fd9349b742d4d754f049202c':
Fix divergent equals and hashCode behavior
Change-Id: I16809877a43fa3b3c70273de2a84a90e493d9caf
Winson [Fri, 6 May 2016 21:08:12 +0000 (21:08 +0000)]
Fix exception when docking task.
am:
27c28f8da2
* commit '
27c28f8da2925fd6fdaa91603c1740447b8fc195':
Fix exception when docking task.
Change-Id: Iec927a1b079a7d6935b8430dca70eec760a84739
Winson [Fri, 6 May 2016 20:58:39 +0000 (20:58 +0000)]
Merge "Disabling movement of entire affiliated task set." into nyc-dev
am:
7e2d589ce0
* commit '
7e2d589ce053ded6d07cc3f93297d6c32128dd3d':
Disabling movement of entire affiliated task set.
Change-Id: Ia307ac34662cf0092f3ba00e20451b312d0cd7a8
TreeHugger Robot [Fri, 6 May 2016 20:54:16 +0000 (20:54 +0000)]
Merge "Fix divergent equals and hashCode behavior" into nyc-dev
Winson [Thu, 5 May 2016 23:16:50 +0000 (16:16 -0700)]
Fix exception when docking task.
- If a task fails to dock, animate the stack back to original state so
that the layout is not stuck in a "docked" state.
Bug:
28577229
Change-Id: If927b898a48cd5949764cb3b0c0798d22efd850a
Winson Chung [Fri, 6 May 2016 20:50:11 +0000 (20:50 +0000)]
Merge "Disabling movement of entire affiliated task set." into nyc-dev
Andrii Kulian [Fri, 6 May 2016 19:53:25 +0000 (12:53 -0700)]
Fix onStop not called when activity is under translucent
Activity was not stopped when device went to sleep if it was covered by
another translucent activity. The issue appeared after ag/864253 which
disabled stopping for visible activities.
Bug:
28191555
Change-Id: I39f0c5579ee3e5a16db888c72ace5dc43aa307bd
Keisuke Kuroyanagi [Fri, 6 May 2016 20:05:34 +0000 (20:05 +0000)]
Merge "Fix: Cannot control ime_switcher and menu after resetting." into nyc-dev
am:
a423e2535b
* commit '
a423e2535b2d79849465db1a24aefa6779cc695b':
Fix: Cannot control ime_switcher and menu after resetting.
Change-Id: I5d50dd2cb84687540a556922ad4000815c8e3073
Alan Viverette [Fri, 6 May 2016 20:01:56 +0000 (16:01 -0400)]
Always mutate child when added to drawable container
Bug:
28456908
Change-Id: I3e7bea85e056882a331aecf7e225134161e685e6
Keisuke Kuroyanagi [Fri, 6 May 2016 19:52:46 +0000 (19:52 +0000)]
Merge "Fix: Cannot control ime_switcher and menu after resetting." into nyc-dev
Pavlin Radoslavov [Fri, 6 May 2016 19:05:47 +0000 (12:05 -0700)]
Fix divergent equals and hashCode behavior
Calling Objects.hash with a byte[] will call the identity hashCode on
the byte[] and this doesn't agree with the use of Objects.deepEquals
in equals.
Bug caught by error prone.
Also, replaced usage of Objects.deepEquals(mServiceDataUuid, ...) with
Objects.equals(mServiceDataUuid, ...), because mServiceDataUuid
is an Object of type ParcelUuid.
Bug:
28585195
Change-Id: Id92734874339985fedafe1a28286a6a4dcd88d3b
Alan Viverette [Fri, 6 May 2016 19:31:23 +0000 (15:31 -0400)]
Cancel animation and jump to current state if not animating picker
Bug:
28629631
Change-Id: I0e1b3c2f2c774e027f2df8c9ab75c7a89bd2ddb7
Steve McKay [Fri, 6 May 2016 19:07:54 +0000 (12:07 -0700)]
Don't persist selection after restore.
Bug:
28469988
Change-Id: I1fec774d8ebdec13b33262d7fe8e17fccd84b657
Sid Soundararajan [Wed, 4 May 2016 22:16:20 +0000 (15:16 -0700)]
Reset Cards as they come into view
This will ensure that they are in the correct configuration. Needed since
recycler view will be re-using views.
BUG:
28632740
Change-Id: Icdaa48696e198cfeb8c37718fec05f7f9b195842
Winson [Tue, 3 May 2016 21:58:12 +0000 (14:58 -0700)]
Disabling movement of entire affiliated task set.
- This CL removes the dependency on the last-active-time of the task
record, since that is dependent on the current system time (which can
be changed by the user). Instead of working around the previous
behavior in ActivityManager which moves all affiliated tasks to the
top when one task is launched, we change the behavior in the AM
directly, and prevent re-sorting the list of recent tasks improperly
(aside from the stable sort which puts the freeform tasks first).
Bug:
27398177
Change-Id: I9fa9b3497d08082fe00aa724538255de87e746d6
Jason Monk [Fri, 6 May 2016 18:43:31 +0000 (14:43 -0400)]
QQS: Fix ripple clipping
Change-Id: Ib29265ca582e8563277466edefb32b0a5c852b2f
Fixes:
28175282
Jason Monk [Fri, 6 May 2016 18:42:09 +0000 (18:42 +0000)]
Merge "QS Header: remove collapsed alarm ripple" into nyc-dev
am:
5df0ee53ac
* commit '
5df0ee53acc90e174f59be6c3c0fe52fd778a66e':
QS Header: remove collapsed alarm ripple
Change-Id: Ic26aef478324ff0a579b73ba901ed8798d814f7d
Wale Ogunwale [Fri, 6 May 2016 18:42:07 +0000 (18:42 +0000)]
Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev
am:
5d6a218d9e
* commit '
5d6a218d9e0d21367f6365d4de51532ca7e14dc9':
Dismiss docked stack if an activity is shown on top of the lock screen
Change-Id: Ia5f98128501fcf648da94d6393f799d83ca89656
Jason Monk [Fri, 6 May 2016 18:35:58 +0000 (18:35 +0000)]
Merge "QS Header: remove collapsed alarm ripple" into nyc-dev
TreeHugger Robot [Fri, 6 May 2016 18:30:22 +0000 (18:30 +0000)]
Merge "Dismiss docked stack if an activity is shown on top of the lock screen" into nyc-dev
Phil Weaver [Fri, 6 May 2016 18:26:21 +0000 (18:26 +0000)]
Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev
am:
b42afe9be0
* commit '
b42afe9be02b23c50c0479e93df2a853be7c369a':
Make AccessibilityService#disableSelf atomic.
Change-Id: I90fc019bb38c2b8c5b71357bce60c8df298bddcc
Christopher Tate [Fri, 6 May 2016 18:25:11 +0000 (11:25 -0700)]
Move the 'pretend idle jobs can run now' broadcast into AMS
It's a protected broadcast, so sending it directly from 'am' is
no longer an option. This is needed for CTS as well as being
generally useful during app development.
Bug
28406044
Change-Id: I101915a8c6f19454330a8db2079a75023c112582
Chris Thornton [Fri, 6 May 2016 18:10:28 +0000 (18:10 +0000)]
Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev
am:
0f6a7abb83
* commit '
0f6a7abb83687e8f800e7754cf585edca725d83e':
Fix NPE in KeyphraseEnrollmentInfo.toString()
Change-Id: Ieeb8c8eeac89a68ffcbcaf31b7f6d2b8c60dea7d
Phil Weaver [Fri, 6 May 2016 18:08:27 +0000 (18:08 +0000)]
Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev
Chris Thornton [Fri, 6 May 2016 18:04:17 +0000 (18:04 +0000)]
Merge "Fix NPE in KeyphraseEnrollmentInfo.toString()" into nyc-dev
Felipe Leme [Wed, 4 May 2016 16:21:43 +0000 (09:21 -0700)]
Refactored NetworkPolicyManagerService mUidRules.
NetworkPolicyManagerService (NMPS) keeps an internal list of uid
rules (mUidRules) for network restrictions, and when these rules
changes it needs to notify external listeners (such as
ConnectivityService / CS).
Prior to Android N, both Data Saver mode (the feature previously known
as "Restrict Baground Data") and Battery Save mode used the same set of
firewall rules to implement their restrictions: when Battery Saver mode
NPMS would mark all networks as metered and set the proper firewall
rules externally.
Recently, these 2 modes were split in 2 distinct firewall rules and
NMPS.updateRuleForRestrictBackgroundLocked() was changed to update
the mUidRules logic based on the Data Saver firewall (since the Battery
Saver firewall changes are handled externally, on
updateRuleForRestrictPowerLocked()). As such, CS was not notified when
the power-related changes were made, which would cause apps to get a
state of CONNECTED / CONNECTED when querying its active connection.
This change refactores the mUidRules to use bitmasks, in preparation for
another change that will fix the issue.
It also fixes a minor bug that was preventing removed packages to be
removed from the whitelist.
BUG:
28521946
Change-Id: I9f0e1509a6192cad403f740c1cd76a6b7dab7d26
Keisuke Kuroyanagi [Fri, 6 May 2016 17:49:54 +0000 (10:49 -0700)]
Fix: Cannot control ime_switcher and menu after resetting.
mButtonDispatchers contains ButtonDispatcher for ime_switcher and menu;
however, in #inflateButton, we tried to find ButtonDispatcher for
menu_ime, which is a FrameLayout containing ime_switcher and menu.
Therefore, after #clearViews and #inflateLayout, ime_switcher and menu
KeyButtonView are not in the corresponding ButtonDispatchers.
It means NavigationBarView#getImeSwitchButton and
NavigationBarView#getMenuButton returns empty ButtonDispatcher.
As a result, we can't control ime switch button and menu button via
NavigationBarView after then. e.g. We can't control ime switch button
visibility.
This CL fixes that issue by calling #addToDispatchers recursively for
ViewGroup children if corresponding ButtonDispatcher is not found. This
behavior is aligned with #addAll.
Bug:
28580774
Change-Id: Ibe724753390b7bbb395a6d53d00bc6d06d00aa9a