OSDN Git Service
Craig Mautner [Wed, 24 Sep 2014 01:48:47 +0000 (01:48 +0000)]
am
d5b329e5: Merge "Force layout and animation when display changes" into lmp-dev
* commit '
d5b329e5aed07ffdd7cf0ba6e2aa100316d1bda8':
Force layout and animation when display changes
Eric Laurent [Wed, 24 Sep 2014 01:48:42 +0000 (01:48 +0000)]
am
ee99d080: Merge "AudioRecord: add HW hotword capture flag" into lmp-dev
* commit '
ee99d0808dabcbad4716c4b90419219f14dbc9fc':
AudioRecord: add HW hotword capture flag
Craig Mautner [Wed, 24 Sep 2014 01:43:01 +0000 (01:43 +0000)]
Merge "Force layout and animation when display changes" into lmp-dev
Eric Laurent [Wed, 24 Sep 2014 01:39:33 +0000 (01:39 +0000)]
Merge "AudioRecord: add HW hotword capture flag" into lmp-dev
Craig Mautner [Wed, 24 Sep 2014 01:37:49 +0000 (18:37 -0700)]
Force layout and animation when display changes
Each time that window manager gets a notification that a display has
been added, removed or changed, run a pass through
performLayoutAndPlaceSurfaces. This ensures that
WindowAnimator.animate() runs once so that the surfaces of remote
displays can be updated with their visibility.
Fixes bug
17533991.
Change-Id: If8745527df86c74da75fbe26b8a2a6fddeb74d2a
Lorenzo Colitti [Wed, 24 Sep 2014 01:29:44 +0000 (01:29 +0000)]
am
895b6726: Merge "Only stop/start clatd if necessary." into lmp-dev
* commit '
895b6726e13611a614d245bbd4232f9f0449727f':
Only stop/start clatd if necessary.
Lorenzo Colitti [Wed, 24 Sep 2014 01:29:36 +0000 (01:29 +0000)]
am
6974f6a9: Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
* commit '
6974f6a97028a42ce79b8e9e1869af0ebf5624f4':
Block address families with routes, not NetworkAgent side channel
Alan Viverette [Wed, 24 Sep 2014 01:29:30 +0000 (01:29 +0000)]
am
f65bf6e6: Merge "Explicitly set Settings background to white" into lmp-dev
* commit '
f65bf6e62ff61d5c5e5c3dc5ca468d3feb2c8175':
Explicitly set Settings background to white
Lorenzo Colitti [Wed, 24 Sep 2014 01:21:08 +0000 (01:21 +0000)]
Merge "Only stop/start clatd if necessary." into lmp-dev
Lorenzo Colitti [Wed, 24 Sep 2014 01:21:04 +0000 (01:21 +0000)]
Merge "Block address families with routes, not NetworkAgent side channel" into lmp-dev
Alan Viverette [Wed, 24 Sep 2014 01:17:52 +0000 (01:17 +0000)]
Merge "Explicitly set Settings background to white" into lmp-dev
Alan Viverette [Wed, 24 Sep 2014 01:15:31 +0000 (18:15 -0700)]
Explicitly set Settings background to white
Fixes a regression where the background was previously the default
color, then changed to #eee even though we still want #fff here.
Removes unnecessary windowBackground re-definition.
BUG:
17520824
Change-Id: I9b3a751ce55fc018a90132078a8e308067f62445
Dianne Hackborn [Wed, 24 Sep 2014 01:12:52 +0000 (01:12 +0000)]
am
0d18d08d: Merge "Work on issue #
17628623: Need to update default preferred activities for YouTube" into lmp-dev
* commit '
0d18d08d54cd2226e2391a8bf50e8e48add24ee0':
Work on issue #
17628623: Need to update default preferred activities for YouTube
Matthew Williams [Wed, 24 Sep 2014 01:12:47 +0000 (01:12 +0000)]
am
07b554fc: Merge "Fix lock ordering in JobScheduler" into lmp-dev
* commit '
07b554fcce08611872ea053ea9c97fa2671fc6db':
Fix lock ordering in JobScheduler
Dianne Hackborn [Wed, 24 Sep 2014 01:00:02 +0000 (01:00 +0000)]
Merge "Work on issue #
17628623: Need to update default preferred activities for YouTube" into lmp-dev
Matthew Williams [Wed, 24 Sep 2014 00:58:54 +0000 (00:58 +0000)]
Merge "Fix lock ordering in JobScheduler" into lmp-dev
Matthew Williams [Tue, 23 Sep 2014 20:39:36 +0000 (13:39 -0700)]
Fix lock ordering in JobScheduler
BUG:
17625667
Two part clean-up.
1) Don't try to lock in onControllerStateChanged. Do it in the handleMessage
instead where the rest of the locking is. This is sufficient to fix this bug.
2) The other side of the deadlock came b/c we lock when cancelling and calling
stopTrackingJob. Controllers handle their own locking so this isn't
necessary. B/c of a potential race from the controller side, added an explicit
check for the JSS to only run an expired job if it still exists.
Change-Id: Iaeebbc19437eb5b73e3ced3168f1fc13e564a4be
Jeff Sharkey [Wed, 24 Sep 2014 00:05:53 +0000 (00:05 +0000)]
am
e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
* commit '
e50b0a6c86c70f5ddcb69984cb99337ce1d96032':
More ACTION_CHOOSER ClipData migration.
Svetoslav [Wed, 24 Sep 2014 00:00:13 +0000 (00:00 +0000)]
am
857f8013: Merge "Fix ANR in print spooler." into lmp-dev
* commit '
857f80134d6c23894f5589457883c57137b2ed27':
Fix ANR in print spooler.
Svetoslav [Wed, 24 Sep 2014 00:00:08 +0000 (00:00 +0000)]
am
ea5d75d8: Merge "Print spooler crash on back before first layout is complete." into lmp-dev
* commit '
ea5d75d807b379592f3bfd6ccd4cb43d02f72f49':
Print spooler crash on back before first layout is complete.
Jeff Sharkey [Tue, 23 Sep 2014 23:58:50 +0000 (23:58 +0000)]
Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev
Svetoslav [Tue, 23 Sep 2014 23:53:21 +0000 (23:53 +0000)]
Merge "Fix ANR in print spooler." into lmp-dev
Svetoslav [Tue, 23 Sep 2014 23:52:58 +0000 (23:52 +0000)]
Merge "Print spooler crash on back before first layout is complete." into lmp-dev
Dianne Hackborn [Tue, 23 Sep 2014 23:45:39 +0000 (16:45 -0700)]
Work on issue #
17628623: Need to update default preferred activities for YouTube
Improve the warning logs when setting up preferred activities
to help identify when there are issues and what they are. Also
improve the algorithm a little to still apply permissions when
resetting them and there are additional third party apps, as long
as the additional app is something like another browser and the
preferred activity being set is more specific (has a better match).
And add an example of using manifest-based preferred activities
in to ActivityTest -- and yes it DOES work! :p
Change-Id: I1ff39e03a5df6526206e0c3882085396b355d814
Michael Wright [Tue, 23 Sep 2014 23:41:38 +0000 (23:41 +0000)]
am
d8e4e4ae: Merge "Add keylayout for Asus Gamepad" into lmp-dev
* commit '
d8e4e4aef15ca2edaa8b18d221cbd80240359445':
Add keylayout for Asus Gamepad
Jeff Sharkey [Tue, 23 Sep 2014 23:40:50 +0000 (16:40 -0700)]
More ACTION_CHOOSER ClipData migration.
Traverse into both EXTRA_INTENT and any EXTRA_INITIAL_INTENTS when
migrating extras to ClipData. Also, we don't need to promote these
ClipData into the parent, since the platform ChooserActivity will
issue any required permission grants for the final user-selected
Intent. Even if we wanted to, we can't combine the various child
Intent flags into anything meaningful at the ACTION_CHOOSER level.
Bug:
17580604
Change-Id: I6b5a1f572a7edf8135e059c67a2643d3736e40ab
Michael Wright [Tue, 23 Sep 2014 23:35:19 +0000 (23:35 +0000)]
Merge "Add keylayout for Asus Gamepad" into lmp-dev
Svetoslav [Tue, 23 Sep 2014 23:22:42 +0000 (16:22 -0700)]
Fix ANR in print spooler.
Saving to PDF a subset of the pages requires trimming the
undesired pages and when this is done writing the ready doc
to a URI. To write the file to URI we have to obtain it but
it is aquired by the shredding task and never released. Now
we are releasing the document immediately after trimming it.
bug:
17631301
Change-Id: I4db7966c65c75f0f14c3cb52fd83b4d8fd5a4687
Michael Wright [Tue, 23 Sep 2014 22:56:17 +0000 (15:56 -0700)]
Add keylayout for Asus Gamepad
Bug:
17627642
Change-Id: I9dd76bbc3ea0493d5a54479ef4dc94c520e35433
Igor Murashkin [Tue, 23 Sep 2014 22:59:56 +0000 (22:59 +0000)]
am
c79b145f: Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
* commit '
c79b145f0216d2f9b099a409fee2c154de1f7019':
camera2-legacy: Workaround max jpeg/preview size AR mismatch
Svetoslav [Tue, 23 Sep 2014 22:27:35 +0000 (15:27 -0700)]
Print spooler crash on back before first layout is complete.
If the user presses back before the remote print document
update has completed we get a crash. The reason is that
after the update completion we were trying to finish the
activity if we are in a cancelled state but this is not
needed as we aready handled the back key so we will finish.
Handling finish twice was creating the problem as classes
with lifecycles are not designed to be used after being
finished. In particular, we were calling doFinish() twice.
bug:
17630561
Change-Id: If418f237a2def7c8e4a072ac8826283f4dd7fc85
Igor Murashkin [Tue, 23 Sep 2014 22:50:29 +0000 (22:50 +0000)]
Merge "camera2-legacy: Workaround max jpeg/preview size AR mismatch" into lmp-dev
vandwalle [Tue, 23 Sep 2014 22:41:28 +0000 (22:41 +0000)]
am
0829f6b6: Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev
* commit '
0829f6b6e1c5dc79b8feb3cebfede2d89384ba85':
handle bssid blacklist in case of dhcp failures
vandwalle [Tue, 23 Sep 2014 22:31:33 +0000 (22:31 +0000)]
Merge "handle bssid blacklist in case of dhcp failures" into lmp-dev
Wink Saville [Tue, 23 Sep 2014 22:25:06 +0000 (22:25 +0000)]
Merge "Add SM isUsableSubIdValue" into lmp-sprout-dev
Igor Murashkin [Tue, 23 Sep 2014 22:11:36 +0000 (15:11 -0700)]
camera2-legacy: Workaround max jpeg/preview size AR mismatch
Filter out the largest preview sizes (from the stream configuration map)
until we find one whose aspect ratio matches the max jpeg aspect ratio.
Keep all other (smaller) preview sizes.
Bug:
17589233
Change-Id: I8ebcaef6439691eff3312da2c37b9abe08a067ad
Wink Saville [Tue, 23 Sep 2014 21:20:58 +0000 (14:20 -0700)]
Add SM isUsableSubIdValue
Change-Id: Ib1381116545688de52bde111acf827b2e07c5621
Jeff Brown [Tue, 23 Sep 2014 21:06:25 +0000 (21:06 +0000)]
am
42ecd144: Merge "Move setting the display state out of the critical section." into lmp-dev
* commit '
42ecd1447eb31fb6e1a08a7f47b73805b0250680':
Move setting the display state out of the critical section.
Jay Shrauner [Tue, 23 Sep 2014 21:06:21 +0000 (21:06 +0000)]
am
44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev
* commit '
44318d379813d9264aafa06a5376e115fe53f1ae':
Fix NPE crash when mPhone is null
Dianne Hackborn [Tue, 23 Sep 2014 21:06:17 +0000 (21:06 +0000)]
am
5a9cfe3e: Merge "Maybe fix issue #
17614177 APR: system process restarting due to infinite loop" into lmp-dev
* commit '
5a9cfe3ea7fdcec78094530032217fca477561b1':
Maybe fix issue #
17614177 APR: system process restarting due to infinite loop
Jeff Brown [Tue, 23 Sep 2014 21:02:42 +0000 (21:02 +0000)]
Merge "Move setting the display state out of the critical section." into lmp-dev
Jay Shrauner [Tue, 23 Sep 2014 20:59:14 +0000 (20:59 +0000)]
Merge "Fix NPE crash when mPhone is null" into lmp-dev
Adam Powell [Tue, 23 Sep 2014 20:55:35 +0000 (20:55 +0000)]
am
c8d72a97: Merge "Track persistent nested Y offset for fling velocity" into lmp-dev
* commit '
c8d72a97c53da122d41b8238f23609f99aca2e02':
Track persistent nested Y offset for fling velocity
Dianne Hackborn [Tue, 23 Sep 2014 20:55:04 +0000 (20:55 +0000)]
Merge "Maybe fix issue #
17614177 APR: system process restarting due to infinite loop" into lmp-dev
Adam Powell [Tue, 23 Sep 2014 20:46:45 +0000 (20:46 +0000)]
Merge "Track persistent nested Y offset for fling velocity" into lmp-dev
John Spurlock [Tue, 23 Sep 2014 20:15:11 +0000 (20:15 +0000)]
am
c107ea73: Merge "Remove redundant wifi-display notification." into lmp-dev
* commit '
c107ea7321829d7c4b7f22f9967ffd0250569b56':
Remove redundant wifi-display notification.
Jeff Brown [Thu, 18 Sep 2014 22:24:49 +0000 (15:24 -0700)]
Move setting the display state out of the critical section.
Setting the display power state currently happens while holding the
display manager lock. This change moves it out of the lock to
ensure other services don't get stuck for several hundred
milliseconds.
Unfortunately, surface flinger ends up stalled a little later
so this only solves part of the problem.
Bug:
17623774
Change-Id: I201137c5e7f82c776f28a436845fcf3191fd0ca5
John Spurlock [Tue, 23 Sep 2014 20:08:12 +0000 (20:08 +0000)]
Merge "Remove redundant wifi-display notification." into lmp-dev
Dianne Hackborn [Tue, 23 Sep 2014 19:57:22 +0000 (19:57 +0000)]
am
14e957ee: Merge "Fix issue #
17307700: retarget a relinquished task is not working" into lmp-dev
* commit '
14e957eeccf89844317273346a8c8baa00e3f2fc':
Fix issue #
17307700: retarget a relinquished task is not working
Jason Monk [Tue, 23 Sep 2014 19:51:27 +0000 (19:51 +0000)]
am
da75ab99: Merge "Add missing permission for hotspot QS tile" into lmp-dev
* commit '
da75ab99f1c77448cba0fb1bb45ac33a17b54532':
Add missing permission for hotspot QS tile
John Spurlock [Tue, 23 Sep 2014 19:51:11 +0000 (15:51 -0400)]
Remove redundant wifi-display notification.
Since all devices now appear in quick settings, remove the
framework notification and obsolete artifacts.
Bug:
17607193
Change-Id: If952b826d79c77068285373c6b44a430f78c20b1
Dianne Hackborn [Tue, 23 Sep 2014 19:49:59 +0000 (19:49 +0000)]
Merge "Fix issue #
17307700: retarget a relinquished task is not working" into lmp-dev
Jason Monk [Tue, 23 Sep 2014 19:42:24 +0000 (19:42 +0000)]
Merge "Add missing permission for hotspot QS tile" into lmp-dev
vandwalle [Fri, 19 Sep 2014 22:21:35 +0000 (15:21 -0700)]
handle bssid blacklist in case of dhcp failures
Change-Id: Iba13db478ed69976c37bd4882f59bf0cae2212e6
Selim Cinek [Tue, 23 Sep 2014 19:34:28 +0000 (19:34 +0000)]
am
69d53b0e: Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev
* commit '
69d53b0ee95c7b27223d12a67bbf653b3b8c9004':
Enforcing falsing-threshold on touch when using AoD
ztenghui [Tue, 23 Sep 2014 19:34:24 +0000 (19:34 +0000)]
am
8518c090: Merge "Fix animation on the some properties" into lmp-dev
* commit '
8518c090e46554d7f7cce51778811abc525b2ae2':
Fix animation on the some properties
Selim Cinek [Tue, 23 Sep 2014 19:28:11 +0000 (19:28 +0000)]
Merge "Enforcing falsing-threshold on touch when using AoD" into lmp-dev
ztenghui [Tue, 23 Sep 2014 19:26:40 +0000 (19:26 +0000)]
Merge "Fix animation on the some properties" into lmp-dev
Tsuwei Chen [Tue, 23 Sep 2014 19:02:26 +0000 (19:02 +0000)]
am
28cec256: Merge "Better detection for SIM information readyness. 1) listen to SUBINFO broadcast intent to better capture SIM info update. 2) notify HAL about SUPL server/host everytime they get set." into lmp-dev
* commit '
28cec256a51c366dce3a69087617f44a6f46c218':
Better detection for SIM information readyness. 1) listen to SUBINFO broadcast intent to better capture SIM info update. 2) notify HAL about SUPL server/host everytime they get set.
Tsuwei Chen [Tue, 23 Sep 2014 18:54:02 +0000 (18:54 +0000)]
Merge "Better detection for SIM information readyness. 1) listen to SUBINFO broadcast intent to better capture SIM info update. 2) notify HAL about SUPL server/host everytime they get set." into lmp-dev
Selim Cinek [Tue, 23 Sep 2014 18:44:35 +0000 (20:44 +0200)]
Enforcing falsing-threshold on touch when using AoD
Also increased the threshold by a factor of 1.5 if
we are waking up due to a touch.
Bug:
17350239
Change-Id: Ida8bad234b3815abf80ca57f8004f3bc5df003cd
Etan Cohen [Tue, 23 Sep 2014 18:34:17 +0000 (18:34 +0000)]
am
dd2b9f07: Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
* commit '
dd2b9f0754948f844517b3c82062c02d91762b28':
Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
Jorim Jaggi [Tue, 23 Sep 2014 18:34:11 +0000 (18:34 +0000)]
am
40a231d3: Merge "Only wait for relevant windows when turning on the screen" into lmp-dev
* commit '
40a231d3d5f6cae79e83f54d3c3e50b596f0c315':
Only wait for relevant windows when turning on the screen
Etan Cohen [Mon, 22 Sep 2014 18:53:33 +0000 (11:53 -0700)]
Modify comment for "VoLTE replacement configuration" to clarify that used for unknown.
Configuration RAT replacement value will be used in any ambiguous (LTE:14) or
unknown (UNKNOWN:0) scenario.
Bug:
16962905
Change-Id: Ica1cc809521df5836143d8a94849541f28342a89
Jorim Jaggi [Tue, 23 Sep 2014 18:26:05 +0000 (18:26 +0000)]
Merge "Only wait for relevant windows when turning on the screen" into lmp-dev
Tsuwei Chen [Tue, 23 Sep 2014 00:48:41 +0000 (17:48 -0700)]
Better detection for SIM information readyness.
1) listen to SUBINFO broadcast intent to better capture SIM info update.
2) notify HAL about SUPL server/host everytime they get set.
Bug:
17288144
Change-Id: I65cb4e0879c55c078e85d062877e491904e78222
ztenghui [Tue, 23 Sep 2014 17:58:57 +0000 (10:58 -0700)]
Fix animation on the some properties
The risk is low since most of them are just matching the naming to xml.
And this update won't cause build breakage.
b/
17623982
Change-Id: I1eda0b8314ec7b94bc03976cdc365a7dc1039f4c
Alan Viverette [Tue, 23 Sep 2014 18:16:43 +0000 (18:16 +0000)]
am
043fc017: Merge "Update refresh icon to tinted material vector asset" into lmp-dev
* commit '
043fc017b713c88122f8d7b6b9cba606e254805a':
Update refresh icon to tinted material vector asset
Ruben Brunk [Tue, 23 Sep 2014 18:16:39 +0000 (18:16 +0000)]
am
30306d89: Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev
* commit '
30306d89bd83fe884b11816f5cfc33d5ab3048cb':
camera2: Update EACCES to throw correct exception in LEGACY.
Alan Viverette [Tue, 23 Sep 2014 18:15:26 +0000 (18:15 +0000)]
Merge "Update refresh icon to tinted material vector asset" into lmp-dev
Ruben Brunk [Tue, 23 Sep 2014 18:08:41 +0000 (18:08 +0000)]
Merge "camera2: Update EACCES to throw correct exception in LEGACY." into lmp-dev
Dianne Hackborn [Tue, 23 Sep 2014 17:56:58 +0000 (10:56 -0700)]
Fix issue #
17307700: retarget a relinquished task is not working
Missed by 1!
Change-Id: If6504e37563d1242df8da4609cbcbcd550d68fdd
Jeff Tinker [Tue, 23 Sep 2014 17:43:07 +0000 (17:43 +0000)]
am
3eeac344: Merge "Implement API review feedback." into lmp-dev
* commit '
3eeac344b1aedf116b2340f3028f2cbaf34945d1':
Implement API review feedback.
Jeff Vander Stoep [Tue, 23 Sep 2014 17:43:04 +0000 (17:43 +0000)]
am
c0471f7a: am
bca67fd7: am
9aaf54ee: am
71b19fc3: am
5ba31e6e: am
bba79795: am
25c866a8: am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
c0471f7a7452c687f0a10588484c0f69d6840541':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 17:43:00 +0000 (17:43 +0000)]
am
c22881d9: am
bbf7e4af: am
1cf337a2: am
52824dab: am
1b4f1a79: am
1c2eaa78: am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
c22881d93a77e6a736b43e49942135ea6a40071e':
Change permission guard on bindBackupAgent()
mike dooley [Tue, 23 Sep 2014 17:42:56 +0000 (17:42 +0000)]
am
6e466a1b: Fixing ConcurrentModificationException.
* commit '
6e466a1b87ce163a48fccea69e8b8f16ef36eee7':
Fixing ConcurrentModificationException.
Jeff Tinker [Tue, 23 Sep 2014 17:39:30 +0000 (17:39 +0000)]
Merge "Implement API review feedback." into lmp-dev
Jeff Vander Stoep [Tue, 23 Sep 2014 17:37:58 +0000 (17:37 +0000)]
am
bca67fd7: am
9aaf54ee: am
71b19fc3: am
5ba31e6e: am
bba79795: am
25c866a8: am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
bca67fd7d0747a950e88525d216af41272b20763':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 17:37:42 +0000 (17:37 +0000)]
am
bbf7e4af: am
1cf337a2: am
52824dab: am
1b4f1a79: am
1c2eaa78: am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
bbf7e4af975493c9c213250a595c63331cb7a872':
Change permission guard on bindBackupAgent()
mike dooley [Thu, 18 Sep 2014 21:07:52 +0000 (14:07 -0700)]
Fixing ConcurrentModificationException.
Implementing review feedback.
Bug:
17572658
Change-Id: I3a060d21669a58188a24c5d6ec5fefcbca45a976
Dianne Hackborn [Tue, 23 Sep 2014 17:13:13 +0000 (10:13 -0700)]
Maybe fix issue #
17614177 APR: system process restarting due to infinite loop
Also try to get rid of a huge wtf we are seeing across a lot of devices
where we incorrectly change real states on a service that is restarting,
and get rid of one of the noisier boot logs in the package manager.
Change-Id: I2510b6fb082eac3f6168cbd57bc3b70ad006114d
Ruben Brunk [Tue, 23 Sep 2014 17:32:18 +0000 (10:32 -0700)]
camera2: Update EACCES to throw correct exception in LEGACY.
Bug:
17595068
Change-Id: I1a88568822237d3609c3342a21e2ca81ca935408
Jeff Vander Stoep [Tue, 23 Sep 2014 17:26:47 +0000 (17:26 +0000)]
am
9aaf54ee: am
71b19fc3: am
5ba31e6e: am
bba79795: am
25c866a8: am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
9aaf54eeb6c1dd83090235a8df5476b2f2f6473e':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 17:26:42 +0000 (17:26 +0000)]
am
1cf337a2: am
52824dab: am
1b4f1a79: am
1c2eaa78: am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
1cf337a222bbb0e26445e7904ece687af93aac48':
Change permission guard on bindBackupAgent()
Tyler Gunn [Tue, 23 Sep 2014 17:25:07 +0000 (17:25 +0000)]
am
fa5456e5: Merge "@hide ConnectionService APIs." into lmp-dev
* commit '
fa5456e5455d215fa73a504d78a8f152d8cd1b05':
@hide ConnectionService APIs.
Tyler Gunn [Tue, 23 Sep 2014 17:13:11 +0000 (17:13 +0000)]
Merge "@hide ConnectionService APIs." into lmp-dev
Jeff Vander Stoep [Tue, 23 Sep 2014 17:12:38 +0000 (17:12 +0000)]
am
71b19fc3: am
5ba31e6e: am
bba79795: am
25c866a8: am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
71b19fc301ff08bd13d394dfa9ef6a3f535b149e':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 17:11:58 +0000 (17:11 +0000)]
am
52824dab: am
1b4f1a79: am
1c2eaa78: am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
52824dab7ba48713411ff3a26580b29aa2088242':
Change permission guard on bindBackupAgent()
Christoph Studer [Tue, 23 Sep 2014 17:11:30 +0000 (17:11 +0000)]
am
5a7068ee: Merge "SysUI: Correctly compare MediaControllers" into lmp-dev
* commit '
5a7068eec454df33575176d9f4ee58de577a6401':
SysUI: Correctly compare MediaControllers
Christoph Studer [Tue, 23 Sep 2014 17:03:47 +0000 (17:03 +0000)]
Merge "SysUI: Correctly compare MediaControllers" into lmp-dev
Jeff Vander Stoep [Tue, 23 Sep 2014 17:02:13 +0000 (17:02 +0000)]
am
5ba31e6e: am
bba79795: am
25c866a8: am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
5ba31e6e9afb34781fe5b927354502d9c6190bc5':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 17:02:04 +0000 (17:02 +0000)]
am
1b4f1a79: am
1c2eaa78: am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
1b4f1a794dc90c1ea877af64e8340afe6146584a':
Change permission guard on bindBackupAgent()
Tyler Gunn [Fri, 19 Sep 2014 18:17:02 +0000 (11:17 -0700)]
@hide ConnectionService APIs.
Bug:
17569532
Change-Id: I68f7237191bd6d7a1a00ba7bb4fd2f8e3d669e8f
Jorim Jaggi [Tue, 23 Sep 2014 16:22:16 +0000 (18:22 +0200)]
Only wait for relevant windows when turning on the screen
Bug:
17536119
Change-Id: Ibe8da9fdd52a1a46eb856425b28ffc4f505b2697
Jeff Vander Stoep [Tue, 23 Sep 2014 16:50:29 +0000 (16:50 +0000)]
am
bba79795: am
25c866a8: am
e2adb1ff: Merge "Sanity-check paths of files to be restored" into jb-mr2-dev
* commit '
bba797957a83b0ee8869cfa8a9427f6506f74fa4':
Sanity-check paths of files to be restored
Jeff Vander Stoep [Tue, 23 Sep 2014 16:50:16 +0000 (16:50 +0000)]
am
1c2eaa78: am
660af7eb: am
59c1202e: Merge "Change permission guard on bindBackupAgent()" into jb-mr2-dev
* commit '
1c2eaa784b2376b674cf438f42342271c8aa79a8':
Change permission guard on bindBackupAgent()
Jeff Brown [Tue, 23 Sep 2014 16:48:43 +0000 (16:48 +0000)]
am
3f51958b: Merge "Fix window manager policy state when waking from doze." into lmp-dev
* commit '
3f51958b1911ffa49ca3d7eb2a9304348ccbf04e':
Fix window manager policy state when waking from doze.
Jeff Brown [Tue, 23 Sep 2014 16:48:40 +0000 (16:48 +0000)]
am
28c9590b: Merge "Ensure wakelock is released unconditionally." into lmp-dev
* commit '
28c9590b90215230b65d98c4d816e0d776a07540':
Ensure wakelock is released unconditionally.
Jeff Brown [Tue, 23 Sep 2014 16:42:52 +0000 (16:42 +0000)]
Merge "Fix window manager policy state when waking from doze." into lmp-dev
Jeff Brown [Tue, 23 Sep 2014 16:39:39 +0000 (16:39 +0000)]
Merge "Ensure wakelock is released unconditionally." into lmp-dev