OSDN Git Service
Adam Lesinski [Mon, 12 Oct 2015 19:34:28 +0000 (19:34 +0000)]
am
2327239d: Merge "Handle \'root\' pseudo-package in the appops command"
* commit '
2327239d65525d8ba2bdbedd6e59809fef447a12':
Handle 'root' pseudo-package in the appops command
Adam Lesinski [Mon, 12 Oct 2015 19:29:14 +0000 (19:29 +0000)]
Merge "Handle 'root' pseudo-package in the appops command"
Adam Lesinski [Mon, 12 Oct 2015 18:59:03 +0000 (18:59 +0000)]
am
7caa8f14: Merge "Make \'idmap --scan\' accept more than one input directory"
* commit '
7caa8f14a78d279e0392089dca2f54f27e7f5d15':
Make 'idmap --scan' accept more than one input directory
Adam Lesinski [Mon, 12 Oct 2015 18:53:25 +0000 (18:53 +0000)]
Merge "Make 'idmap --scan' accept more than one input directory"
Wale Ogunwale [Mon, 12 Oct 2015 14:44:46 +0000 (14:44 +0000)]
am
1ca9f481: Merge "Fix resumeHomeStackTask can\'t resume home if activity is finishing."
* commit '
1ca9f4812749a3eff0654e2ea7773e8b3704c1da':
Fix resumeHomeStackTask can't resume home if activity is finishing.
Wale Ogunwale [Mon, 12 Oct 2015 14:39:16 +0000 (14:39 +0000)]
Merge "Fix resumeHomeStackTask can't resume home if activity is finishing."
Mark Lu [Thu, 8 Oct 2015 05:31:01 +0000 (13:31 +0800)]
Fix resumeHomeStackTask can't resume home if activity is finishing.
Not to resume home activity in finishing stage as following case:
When only home task has 2 activities,
(ex: SetupWizard & DeviceOwnerProvisioningActivity),
If SetupWizard crashed during DeviceOwnerProvisioningActivity in
finishing stage,
makes DeviceOwnerProvisioningActivity cannot destroy immediately,
In resumeHomeStackTask, will resume DeviceOwnerProvisioningActivity
(returned by getHomeActivity),
But actually, DeviceOwnerProvisioningActivity cannot be resumed.
Caused ANR when back key since no more running activity can resume.
Change-Id: Icec49e092d2e7bee7f6a2d198913c1c5db7122f2
Pirama Arumuga Nainar [Fri, 9 Oct 2015 17:03:14 +0000 (17:03 +0000)]
am
d5992114: Merge "Fix punctuation and typos in AllocationAdapter\'s documentation."
* commit '
d59921149bb5948ffbcb9a9e832e9ac1538e05a0':
Fix punctuation and typos in AllocationAdapter's documentation.
Pirama Arumuga Nainar [Fri, 9 Oct 2015 16:57:54 +0000 (16:57 +0000)]
Merge "Fix punctuation and typos in AllocationAdapter's documentation."
Filip Gruszczynski [Thu, 8 Oct 2015 23:54:13 +0000 (23:54 +0000)]
am
21b37a5f: Merge "Make accessing mInputMethodTarget thread-safe"
* commit '
21b37a5fb46f3dcd20bba0c621d8859e1c8dc32e':
Make accessing mInputMethodTarget thread-safe
Filip Gruszczynski [Thu, 8 Oct 2015 23:50:17 +0000 (23:50 +0000)]
Merge "Make accessing mInputMethodTarget thread-safe"
Pirama Arumuga Nainar [Thu, 8 Oct 2015 02:59:48 +0000 (19:59 -0700)]
Fix punctuation and typos in AllocationAdapter's documentation.
Change-Id: I5574ff201b857a29f30ebe8413dbe4128dcff3ae
Tim Murray [Wed, 7 Oct 2015 23:39:16 +0000 (23:39 +0000)]
am
6c271b89: am
f3acc630: am
01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
* commit '
6c271b898c080303c24e524022dd6e4552bda5f5':
Ensure SurfaceView requests WM relayout when size changes.
Tim Murray [Wed, 7 Oct 2015 23:32:28 +0000 (23:32 +0000)]
am
f3acc630: am
01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
* commit '
f3acc63015cb3093c3bdc11f6dbd1db2f375eeca':
Ensure SurfaceView requests WM relayout when size changes.
Tim Murray [Wed, 7 Oct 2015 23:28:13 +0000 (23:28 +0000)]
am
01356906: Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
* commit '
0135690688c8285e022a2a8191c8582f2e6ea759':
Ensure SurfaceView requests WM relayout when size changes.
Chien-Yu Chen [Wed, 7 Oct 2015 23:22:24 +0000 (23:22 +0000)]
am
d07d0071: am
02e4400c: am
ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
* commit '
d07d007161e2f64e88eba9f78778ab63b3dd6ab9':
MediaActionSound: Fix video stop sound
Tim Murray [Wed, 7 Oct 2015 23:21:14 +0000 (23:21 +0000)]
Merge "Ensure SurfaceView requests WM relayout when size changes." into mnc-dr-dev
Chien-Yu Chen [Wed, 7 Oct 2015 23:17:39 +0000 (23:17 +0000)]
am
02e4400c: am
ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
* commit '
02e4400cc734079bcc275d14a9ae4d16609403c8':
MediaActionSound: Fix video stop sound
Chien-Yu Chen [Wed, 7 Oct 2015 23:11:20 +0000 (23:11 +0000)]
am
ab781275: Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
* commit '
ab7812750bca947abc9e8b1ce73a3041dbc2f2a9':
MediaActionSound: Fix video stop sound
Chien-Yu Chen [Wed, 7 Oct 2015 23:03:52 +0000 (23:03 +0000)]
Merge "MediaActionSound: Fix video stop sound" into mnc-dr-dev
Chien-Yu Chen [Wed, 7 Oct 2015 22:17:19 +0000 (15:17 -0700)]
MediaActionSound: Fix video stop sound
Bug:
24745252
Change-Id: I803679d52750e09c7fc7b881523becf9259b558b
Yin-Chia Yeh [Wed, 7 Oct 2015 21:54:41 +0000 (21:54 +0000)]
am
527da81f: am
a71bb6b9: am
9d688336: am
a636be6c: Camera: fix wrong FULL feature string
* commit '
527da81f13fa65b924859ae87f6ccce8d3614140':
Camera: fix wrong FULL feature string
Yin-Chia Yeh [Wed, 7 Oct 2015 21:50:17 +0000 (21:50 +0000)]
am
a71bb6b9: am
9d688336: am
a636be6c: Camera: fix wrong FULL feature string
* commit '
a71bb6b986156b8bd32e387afc74b1ff066fd2a7':
Camera: fix wrong FULL feature string
Yin-Chia Yeh [Wed, 7 Oct 2015 21:41:38 +0000 (21:41 +0000)]
am
9d688336: am
a636be6c: Camera: fix wrong FULL feature string
* commit '
9d68833686e04ff5ff910a9d90fe99bc1347aaca':
Camera: fix wrong FULL feature string
Yin-Chia Yeh [Wed, 7 Oct 2015 21:36:35 +0000 (21:36 +0000)]
am
a636be6c: Camera: fix wrong FULL feature string
* commit '
a636be6c9a8a9192f72a111c2b3084a226d37b7e':
Camera: fix wrong FULL feature string
Deepanshu Gupta [Wed, 7 Oct 2015 21:23:43 +0000 (21:23 +0000)]
am
9969f858: LayoutLib: Fix ring rendering.
* commit '
9969f858c34ba7e35a977c819f2d1e24de586990':
LayoutLib: Fix ring rendering.
Robert Carr [Wed, 7 Oct 2015 18:24:31 +0000 (11:24 -0700)]
Ensure SurfaceView requests WM relayout when size changes.
In the case of scaled SurfaceViews with a fixed size.
It is possible for the surface layout size to change
without a change to the surface size or position. In this
case we need to inform the window manager so it can update
frames and scaling. This has presented in Camera and required
workarounds such as changing the fixed surface size to trigger
an update (leading to visual artifacts).
Bug:
23974105
Change-Id: I195aa0832907c32874b294101b56e198e853dce5
(cherry picked from commit
a8fe43f09c0ed2119e55139a482f7f12fbe7d725)
Deepanshu Gupta [Wed, 7 Oct 2015 18:47:50 +0000 (11:47 -0700)]
LayoutLib: Fix ring rendering.
Bug: http://b.android.com/65503
Change-Id: I6ed901703cffee345f3083ea3ddeb52a28f4ac64
Snild Dolkow [Thu, 3 Sep 2015 09:50:05 +0000 (11:50 +0200)]
Handle 'root' pseudo-package in the appops command
The AppOpsService handles the 'root' pseudo-package as any other; it
gets no automatic allowances. This is reasonable, but it blocked me from
accessing the mms-sms provider through the 'content' command, even in a
root shell.
So I tried to change the rules:
$ adb root
$ adb shell appops set root WRITE_SMS allow
Error: No UID for root in user 0
This error occurs in the appops command because there isn't really a
package called root, so the UID lookup via PackageManager fails.
But we know that root is UID 0, so we can just skip the lookup.
(Also, AppOpsService handles the other way around in getOpsLocked method.)
Change-Id: Ie0cad67efa438a74a4d9921d29933610cfb13974
Mårten Kongstad [Fri, 20 Mar 2015 11:57:36 +0000 (12:57 +0100)]
Make 'idmap --scan' accept more than one input directory
The 'idmap --scan' command was limited to only scan a single directory
for overlay packages. Update idmap to support any number of directories.
Change-Id: I851f5720a3c1d844235911a0833670652a20a3c8
Deepanshu Gupta [Wed, 7 Oct 2015 17:17:02 +0000 (17:17 +0000)]
am
8db8bc63: Merge "Skip drawing empty shapes to keep Apple JRE happy." into mnc-ub-dev
* commit '
8db8bc63624bbd1d803e02571fa865f1f7fa584c':
Skip drawing empty shapes to keep Apple JRE happy.
Deepanshu Gupta [Wed, 7 Oct 2015 17:08:30 +0000 (17:08 +0000)]
Merge "Skip drawing empty shapes to keep Apple JRE happy." into mnc-ub-dev
Alan Viverette [Wed, 7 Oct 2015 16:54:26 +0000 (16:54 +0000)]
am
f518ad0a: Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"
* commit '
f518ad0a4941236b72b5d090320d4ab70ebbf26b':
IndexOutOfBoundsException on addPreference in PreferenceGroup
Alan Viverette [Wed, 7 Oct 2015 16:54:17 +0000 (16:54 +0000)]
am
f8ac5c34: Merge "Reset the setOnKeyListener callback when view is destroyed"
* commit '
f8ac5c3469e53a7934731cfb854efb2975251ab4':
Reset the setOnKeyListener callback when view is destroyed
Alan Viverette [Wed, 7 Oct 2015 16:41:30 +0000 (16:41 +0000)]
am
e229f5dd: Merge "Text size for empty view shall be styled according to theme"
* commit '
e229f5ddde98f7c78ddc15a64587a684b5cf90a5':
Text size for empty view shall be styled according to theme
Alan Viverette [Wed, 7 Oct 2015 16:41:18 +0000 (16:41 +0000)]
am
43f0fdc5: Merge "Remove hard-coded DrawSelectorOnTop on ListFragment\'s default ListView."
* commit '
43f0fdc5cd7ec4c4c03c7dbea8c045d2186f942c':
Remove hard-coded DrawSelectorOnTop on ListFragment's default ListView.
Alan Viverette [Wed, 7 Oct 2015 16:38:02 +0000 (16:38 +0000)]
Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup"
Alan Viverette [Wed, 7 Oct 2015 16:36:58 +0000 (16:36 +0000)]
Merge "Reset the setOnKeyListener callback when view is destroyed"
Alan Viverette [Wed, 7 Oct 2015 16:34:35 +0000 (16:34 +0000)]
am
6a06f12c: Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"
* commit '
6a06f12c3fa6a84306dc17f60eb16cdc25bc34b5':
Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams
Alan Viverette [Wed, 7 Oct 2015 16:34:26 +0000 (16:34 +0000)]
am
7de6ae15: Merge "To call TypedArray.recycle() when we are done with the array."
* commit '
7de6ae159e0652cabe57ea8814ce8633049644a2':
To call TypedArray.recycle() when we are done with the array.
Alan Viverette [Wed, 7 Oct 2015 16:30:36 +0000 (16:30 +0000)]
Merge "Text size for empty view shall be styled according to theme"
Deepanshu Gupta [Wed, 7 Oct 2015 16:26:46 +0000 (09:26 -0700)]
Skip drawing empty shapes to keep Apple JRE happy.
Bug: http://b.android.com/178278
Change-Id: I693912678ed79e9c6690560b618a605da5a807c6
Alan Viverette [Wed, 7 Oct 2015 16:27:26 +0000 (16:27 +0000)]
Merge "Remove hard-coded DrawSelectorOnTop on ListFragment's default ListView."
Alan Viverette [Wed, 7 Oct 2015 16:23:36 +0000 (16:23 +0000)]
Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"
Alan Viverette [Wed, 7 Oct 2015 16:22:36 +0000 (16:22 +0000)]
Merge "To call TypedArray.recycle() when we are done with the array."
Diego Perez [Wed, 7 Oct 2015 16:09:49 +0000 (16:09 +0000)]
am
081cebf5: Implement Path.approximate and add PathMeasure support
* commit '
081cebf52b19e848c07fb781b35fa1f96695c311':
Implement Path.approximate and add PathMeasure support
Diego Perez [Wed, 7 Oct 2015 11:33:44 +0000 (12:33 +0100)]
Implement Path.approximate and add PathMeasure support
PathMeasure is needed to use the trimPath* properties in drawables.
These properties are used in the vector drawable for indeterminate
progress bars in Material so this is needed to be able to render them
correctly in the preview.
PathMeasure makes use of Path.approximate to calculate which segments to
paint.
Change-Id: Ic513f0a30a6aac0317f7c13cd75e9154c37405c8
Eric Laurent [Wed, 7 Oct 2015 13:56:41 +0000 (13:56 +0000)]
am
c6865806: am
f5d3f960: am
2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
* commit '
c6865806a4f76c44bc3cc55cff87cc85f0a48061':
ZenModeHelper: fix cross deadlock with AudioService
Eric Laurent [Wed, 7 Oct 2015 13:50:02 +0000 (13:50 +0000)]
am
f5d3f960: am
2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
* commit '
f5d3f96001b42ff902022ebf4d97f9ab5e1f26f8':
ZenModeHelper: fix cross deadlock with AudioService
Eric Laurent [Wed, 7 Oct 2015 13:46:48 +0000 (13:46 +0000)]
am
2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
* commit '
2a6f1d4af39a72abecf16cc0a95feda7431afc07':
ZenModeHelper: fix cross deadlock with AudioService
Eric Laurent [Wed, 7 Oct 2015 13:39:51 +0000 (13:39 +0000)]
Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev
Yin-Chia Yeh [Tue, 6 Oct 2015 20:45:20 +0000 (13:45 -0700)]
Camera: fix wrong FULL feature string
Bug:
24678065
Change-Id: I2ca49565b919c87005d941863e22e3852a01a6c6
Selim Cinek [Tue, 6 Oct 2015 02:17:58 +0000 (02:17 +0000)]
am
ab8616cf: am
235a6911: am
714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
* commit '
ab8616cf183cd408039be394fee709f4e0ee1303':
Ambient display now comes up immediately when a notification comes in
Selim Cinek [Tue, 6 Oct 2015 02:11:51 +0000 (02:11 +0000)]
am
235a6911: am
714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
* commit '
235a6911b0939adc598e4135e1f1c6fcda9ff169':
Ambient display now comes up immediately when a notification comes in
Selim Cinek [Tue, 6 Oct 2015 02:06:20 +0000 (02:06 +0000)]
am
714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
* commit '
714a61cd586c789b18acfd0567cfea2b4ea170dd':
Ambient display now comes up immediately when a notification comes in
Selim Cinek [Tue, 6 Oct 2015 01:59:50 +0000 (01:59 +0000)]
Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev
Adam Lesinski [Tue, 6 Oct 2015 01:11:20 +0000 (01:11 +0000)]
am
42efe5b3: am
c87996e5: am
8461f2fa: am
46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
* commit '
42efe5b333c1f28127da57a44b39bd72cfbe81b2':
Add anydpi to the providing-resources docs
Adam Lesinski [Tue, 6 Oct 2015 01:03:49 +0000 (01:03 +0000)]
am
c87996e5: am
8461f2fa: am
46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
* commit '
c87996e5382a5e9bc4ae400e1879d7c655d8b46a':
Add anydpi to the providing-resources docs
Adam Lesinski [Tue, 6 Oct 2015 00:57:43 +0000 (00:57 +0000)]
am
8461f2fa: am
46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
* commit '
8461f2fa02c4c2ca2eef5bae391f1d1ff2c28593':
Add anydpi to the providing-resources docs
Adam Lesinski [Tue, 6 Oct 2015 00:51:13 +0000 (00:51 +0000)]
am
46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev
* commit '
46684d2caeef93f43be260d996e925ea6e4147ea':
Add anydpi to the providing-resources docs
Jean-Michel Trivi [Tue, 6 Oct 2015 00:27:18 +0000 (00:27 +0000)]
am
7f33f6e9: am
38b987ab: am
0155856a: Fix AudioService rotation helper thread
* commit '
7f33f6e92fa22f47af2f8d61883197013fae4c66':
Fix AudioService rotation helper thread
Jean-Michel Trivi [Tue, 6 Oct 2015 00:20:09 +0000 (00:20 +0000)]
am
38b987ab: am
0155856a: Fix AudioService rotation helper thread
* commit '
38b987ab794f7e249a239db26dcf98ca8d2ff72b':
Fix AudioService rotation helper thread
Jean-Michel Trivi [Tue, 6 Oct 2015 00:14:01 +0000 (00:14 +0000)]
am
0155856a: Fix AudioService rotation helper thread
* commit '
0155856a1d1cb272d83b6175953dd7151fe65daa':
Fix AudioService rotation helper thread
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:47:42 +0000 (23:47 +0000)]
am
456a4516: am
a186456f: Safely handle interrupts during Thread.join()
* commit '
456a451668728a18198927fe93f19896929535d3':
Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:42:13 +0000 (23:42 +0000)]
am
a186456f: Safely handle interrupts during Thread.join()
* commit '
a186456ff58a6091603956b6788565a273a29485':
Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:39:04 +0000 (23:39 +0000)]
am
c9390c8b: am
46b51097: Merge "Safely handle interrupts during Thread.join()"
* commit '
c9390c8baf0a41633c176d6d9a2d7e5d0c61c387':
Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:33:38 +0000 (23:33 +0000)]
am
46b51097: Merge "Safely handle interrupts during Thread.join()"
* commit '
46b51097b92900866ac5b25762f622d3ceb1be5d':
Safely handle interrupts during Thread.join()
Pirama Arumuga Nainar [Fri, 2 Oct 2015 23:38:08 +0000 (16:38 -0700)]
Safely handle interrupts during Thread.join()
Interrupt current thread if InterruptedException is received during
Thread.join(). Also, log the interruption.
Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
(cherry picked from commit
83461d73bc50d41f631e1db5c195d12b4eb9e6cf)
Pirama Arumuga Nainar [Mon, 5 Oct 2015 23:27:10 +0000 (23:27 +0000)]
Merge "Safely handle interrupts during Thread.join()"
Deepanshu Gupta [Mon, 5 Oct 2015 23:22:18 +0000 (23:22 +0000)]
am
e5d3baf2: LayoutLib: Fix bitmap scaling.
* commit '
e5d3baf22f046d0a579128fc258f6b92e700ca02':
LayoutLib: Fix bitmap scaling.
Deepanshu Gupta [Mon, 5 Oct 2015 21:37:54 +0000 (14:37 -0700)]
LayoutLib: Fix bitmap scaling.
Bug: http://b.android.com/187939
Change-Id: I20bf61746e8af3bb87ba9cfcc9bf58854ac7c5be
Pirama Arumuga Nainar [Fri, 2 Oct 2015 23:38:08 +0000 (16:38 -0700)]
Safely handle interrupts during Thread.join()
Interrupt current thread if InterruptedException is received during
Thread.join(). Also, log the interruption.
Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
Adam Lesinski [Mon, 5 Oct 2015 22:31:22 +0000 (22:31 +0000)]
Merge "Add anydpi to the providing-resources docs" into mnc-dev
Jean-Michel Trivi [Mon, 5 Oct 2015 22:26:21 +0000 (15:26 -0700)]
Fix AudioService rotation helper thread
Fix a race condition where the wait index can be incremented inbetween
the while() loop and the lock
Fix when updateOrientation() is called: after the sleep, otherwise
the last sleep is useless.
Bug
24677424
Change-Id: I03770a0fc8af57f4696ebee7e9c9110e17c55a24
Adam Lesinski [Tue, 8 Sep 2015 21:16:49 +0000 (14:16 -0700)]
Add anydpi to the providing-resources docs
Change-Id: Ic108d9da2e39b9f8581311fe610a1959a24a732f
Nick Armstrong-Crews [Mon, 5 Oct 2015 18:34:57 +0000 (18:34 +0000)]
am
f107709f: am
13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev
* commit '
f107709fb3f884f904deb1f3c09a88dd411ea30d':
Fix the logging of wake time saved by Ungaze.
Nick Armstrong-Crews [Mon, 5 Oct 2015 18:29:24 +0000 (18:29 +0000)]
am
13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev
* commit '
13a71fbcf056d34421a7740a75e2c8dc11d30eb6':
Fix the logging of wake time saved by Ungaze.
Nick Armstrong-Crews [Mon, 5 Oct 2015 18:23:12 +0000 (18:23 +0000)]
Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev
Nick Armstrong-Crews [Wed, 30 Sep 2015 23:49:19 +0000 (16:49 -0700)]
Fix the logging of wake time saved by Ungaze.
The logging of saved time was erroneously being called more than once
per wake period. Moved the logging logic to be called from
finishWakefulnessChange(), which is only called once per wake period.
Change-Id: I268ef44edce5807644fcc8fb0dcaa1a96cae6c9e
Eric Laurent [Thu, 1 Oct 2015 00:44:28 +0000 (17:44 -0700)]
ZenModeHelper: fix cross deadlock with AudioService
Processing ZenModeHelper.setConfig() synchronously in
ZenModeConditions.onConditionChanged() can cause a cross deadlock between
ConditionProviders.mMutex and AudioService.mSettingsLock.
Add a method to set Zen mode config asynchronously.
Bug:
24528290.
Change-Id: I9c1701ca6bef084527821175d84002b612241995
Geoff Mendal [Mon, 5 Oct 2015 14:16:19 +0000 (14:16 +0000)]
am
ad111b65: (-s ours) am
3daab8e7: (-s ours) am
faebbe82: (-s ours) Import translations. DO NOT MERGE
* commit '
ad111b653251e0af212da964d56112cda7d628d9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 14:09:18 +0000 (14:09 +0000)]
am
3daab8e7: (-s ours) am
faebbe82: (-s ours) Import translations. DO NOT MERGE
* commit '
3daab8e7a7e68ceb8f15cfcb0d8becf4e86a6c05':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 14:05:00 +0000 (14:05 +0000)]
am
faebbe82: (-s ours) Import translations. DO NOT MERGE
* commit '
faebbe82fa72036db75d679d366681822d2d551c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Oct 2015 13:58:33 +0000 (06:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I21cc5a0ce2710498f3aa76c904e653b90a14ecda
Auto-generated-cl: translation import
Stephen Hines [Sat, 3 Oct 2015 00:46:17 +0000 (00:46 +0000)]
am
ee144b1e: resolved conflicts for
bd57dac5 to stage-aosp-master
* commit '
ee144b1e60a88e8f097113e046813f0b61c38b9b':
Don't unregister Fonts from renderer at destruction
Stephen Hines [Sat, 3 Oct 2015 00:34:05 +0000 (17:34 -0700)]
resolved conflicts for
bd57dac5 to stage-aosp-master
Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
Pirama Arumuga Nainar [Fri, 2 Oct 2015 22:59:51 +0000 (22:59 +0000)]
am
24f02483: am
67775422: Retry if interrupted before mMessageThread has joined
* commit '
24f02483172a9802222da29e9db3832b93dd46a6':
Retry if interrupted before mMessageThread has joined
Pirama Arumuga Nainar [Fri, 2 Oct 2015 22:54:04 +0000 (22:54 +0000)]
am
67775422: Retry if interrupted before mMessageThread has joined
* commit '
677754225d9dcd3982d486bc4ead31d6f74de89b':
Retry if interrupted before mMessageThread has joined
Pirama Arumuga Nainar [Fri, 2 Oct 2015 19:06:10 +0000 (12:06 -0700)]
Retry if interrupted before mMessageThread has joined
Bug:
24342101
If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing. Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.
Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
(cherry picked from commit
2f25ce7753f7f1f6a0cc549a0df0082286bd5f85)
Chris Craik [Fri, 2 Oct 2015 22:30:09 +0000 (22:30 +0000)]
Merge "Don't unregister Fonts from renderer at destruction"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 22:16:20 +0000 (22:16 +0000)]
am
5fbb2452: am
ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
* commit '
5fbb245230317b5ca312556b73380195871827eb':
Retry if interrupted before mMessageThread has joined
Pirama Arumuga Nainar [Fri, 2 Oct 2015 22:08:11 +0000 (22:08 +0000)]
am
ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
* commit '
ca3e5aeaa65ae1d77ce92f082ab789933eb18237':
Retry if interrupted before mMessageThread has joined
Pirama Arumuga Nainar [Fri, 2 Oct 2015 21:58:50 +0000 (21:58 +0000)]
Merge "Retry if interrupted before mMessageThread has joined"
Pirama Arumuga Nainar [Fri, 2 Oct 2015 19:06:10 +0000 (12:06 -0700)]
Retry if interrupted before mMessageThread has joined
Bug:
24342101
If interrupted during mMessageThread.join(), retry the join instead of
assuming the thread has joined and continuing. Continuing to destroy
the context will cause a segfault when the message thread attempts to
use the destroyed context.
Change-Id: I3213091a0e996449bceb403dffca3063786d5a65
Chris Craik [Fri, 2 Oct 2015 21:19:39 +0000 (14:19 -0700)]
Don't unregister Fonts from renderer at destruction
bug:
24584749
Fonts are only destroyed when the renderer is destroyed, this prevents
modifying the FontRenderer's LruCache while it's being iterated through
in FontRenderer::~FontRenderer.
Change-Id: I0e2c9f87981bfa50454ec8689df05851839e288e
Tim Murray [Fri, 2 Oct 2015 20:59:09 +0000 (20:59 +0000)]
am
0e28d919: am
3af80eff: am
79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '
0e28d9196deb28af89c0ea075a91ca45c989fde9':
Send POWER_HINT_INTERACTION on rotate.
Tim Murray [Fri, 2 Oct 2015 20:54:58 +0000 (20:54 +0000)]
am
3af80eff: am
79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '
3af80eff608b2ee2de7291f82b9163d5df4b15cf':
Send POWER_HINT_INTERACTION on rotate.
Tim Murray [Fri, 2 Oct 2015 20:48:04 +0000 (20:48 +0000)]
am
79176379: Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
* commit '
791763796e5f21e34c3ae81c1faad2a4c1a515dd':
Send POWER_HINT_INTERACTION on rotate.
Tim Murray [Fri, 2 Oct 2015 20:43:30 +0000 (20:43 +0000)]
Merge "Send POWER_HINT_INTERACTION on rotate." into mnc-dr-dev
Jorim Jaggi [Fri, 2 Oct 2015 20:15:06 +0000 (20:15 +0000)]
am
c69f4b96: am
54afa2bd: am
8c66fa94: Merge "Add minimum time for double tap gesture" into mnc-dr-dev
* commit '
c69f4b962e1111ed44399c1243829384f83b9f2f':
Add minimum time for double tap gesture