OSDN Git Service
Wale Ogunwale [Wed, 22 Jul 2015 20:24:10 +0000 (20:24 +0000)]
am
ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev
* commit '
ff21279e2cbe0bdd9c41350b7a204cabf9370377':
Fixed issue with not finding existing activity for background user
Kenny Guy [Wed, 22 Jul 2015 20:24:05 +0000 (20:24 +0000)]
am
2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev
* commit '
2ba3fec6e0222754d93ed7a491354164d113ad6e':
Support waiting for adb shell am stop-user to complete.
Jason Monk [Wed, 22 Jul 2015 20:24:00 +0000 (20:24 +0000)]
am
41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev
* commit '
41cfd3f8c0df036345807f87b828b4b68bdaffdf':
Fix blank tiles on QS rotate
Jason Monk [Wed, 22 Jul 2015 20:23:55 +0000 (20:23 +0000)]
am
a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev
* commit '
a910a04b8a079a01d684266875eb18c318012de4':
Fix crash in NetworkControllerImpl
Jim Miller [Wed, 22 Jul 2015 20:23:41 +0000 (20:23 +0000)]
am
091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes.
* commit '
091f0e5c6c7f9e72a6e661c4849a2e232823075b':
Make FingerprintService more tolerant of fingerprintd crashes.
Svetoslav Ganov [Wed, 22 Jul 2015 20:23:28 +0000 (20:23 +0000)]
am
bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev
* commit '
bdb7d936512a39b6c06411d11a26824b82e5727f':
Update permission icons to final versions - framework
George Mount [Wed, 22 Jul 2015 20:23:02 +0000 (20:23 +0000)]
am
7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
* commit '
7c482463cbea39cdbf2c3c8f481d82711cf0475b':
Null checks to prevent NPEs in Fragments transactions.
Jorim Jaggi [Wed, 22 Jul 2015 20:22:56 +0000 (20:22 +0000)]
am
20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
* commit '
20df62345910ad390a3bb321990987757db0831d':
Add callback to voice interaction session for lockscreen shown
Adrian Roos [Wed, 22 Jul 2015 19:00:50 +0000 (12:00 -0700)]
resolved conflicts for merge of
c1244a29 to mnc-dr-dev
Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139
Geoff Mendal [Wed, 22 Jul 2015 15:56:29 +0000 (15:56 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 22 Jul 2015 15:42:52 +0000 (10:42 -0500)]
Import translations. DO NOT MERGE
Change-Id: If03e28dba328619399e4f81a01283afbebd7d50d
Auto-generated-cl: translation import
Wale Ogunwale [Wed, 22 Jul 2015 14:21:31 +0000 (14:21 +0000)]
Merge "Fixed issue with not finding existing activity for background user" into mnc-dev
Geoff Mendal [Wed, 22 Jul 2015 13:58:09 +0000 (13:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 22 Jul 2015 13:53:49 +0000 (06:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: If222f66dff503d3b3f0349d76fd082a6780414d7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Jul 2015 13:51:43 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 22 Jul 2015 13:50:26 +0000 (06:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I064668ffb91d718c0981ecd0f221e5f3b0d364d7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 22 Jul 2015 13:49:42 +0000 (06:49 -0700)]
Import translations. DO NOT MERGE
Change-Id: I51a4605c050aab170712962b4cc2a7df7ca9174d
Auto-generated-cl: translation import
Kenny Guy [Wed, 22 Jul 2015 13:49:20 +0000 (13:49 +0000)]
Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev
Jason Monk [Wed, 22 Jul 2015 12:56:40 +0000 (12:56 +0000)]
Merge "Fix blank tiles on QS rotate" into mnc-dev
Jason Monk [Wed, 22 Jul 2015 12:54:20 +0000 (12:54 +0000)]
Merge "Fix crash in NetworkControllerImpl" into mnc-dev
Jim Miller [Tue, 21 Jul 2015 23:58:46 +0000 (16:58 -0700)]
Make FingerprintService more tolerant of fingerprintd crashes.
- attempt to restart fingerprintd on the next request
- inform clients that the hardware isn't available and cancel
listeners.
Fixes bug
22492148
Change-Id: Ib27eaf7f197c6a4e6ed9b085602882904d6b794d
Svetoslav Ganov [Wed, 22 Jul 2015 00:06:10 +0000 (00:06 +0000)]
Merge "Update permission icons to final versions - framework" into mnc-dev
Wale Ogunwale [Tue, 21 Jul 2015 23:54:54 +0000 (16:54 -0700)]
Fixed issue with not finding existing activity for background user
We currently go through the list of existing activities to find
a match for the launching intent so we can re-use the activity
record if one already exist. However, we exit the search early
once we run across an activity record that doesn't belong to the
current foreground user. This will cause us to create duplicate
activity records if the launching intent is for a backround
user and an activity record already exist.
Based on https://android-review.googlesource.com/#/c/159131
Bug:
22564256
Change-Id: I4b6d94059c11fd2e621e65c8ec2c99427c15b246
George Mount [Tue, 21 Jul 2015 22:51:27 +0000 (22:51 +0000)]
Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev
Jorim Jaggi [Tue, 21 Jul 2015 22:46:30 +0000 (22:46 +0000)]
Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
Jorim Jaggi [Tue, 21 Jul 2015 21:53:09 +0000 (21:53 +0000)]
Merge "Touch, wake and unlock" into mnc-dev
Jeff Sharkey [Tue, 21 Jul 2015 21:36:56 +0000 (21:36 +0000)]
am
cf051d18: Merge "Avoid NPE when no staged installs." into mnc-dev
* commit '
cf051d1846c347413d8c907b42f3fce74795a815':
Avoid NPE when no staged installs.
George Mount [Tue, 21 Jul 2015 21:30:24 +0000 (14:30 -0700)]
Null checks to prevent NPEs in Fragments transactions.
Bug
22631964
Change-Id: I20bc80bfb0ba5f1081d1c349b94db7c5475bcc51
Jeff Sharkey [Tue, 21 Jul 2015 21:23:56 +0000 (21:23 +0000)]
Merge "Avoid NPE when no staged installs." into mnc-dev
John Reck [Tue, 21 Jul 2015 21:04:45 +0000 (21:04 +0000)]
am
1fddd3ef: Merge "Mark isInUse per-window" into mnc-dev
* commit '
1fddd3efa9ac10e794d7bdf457b7b52c7e4614f7':
Mark isInUse per-window
John Reck [Tue, 21 Jul 2015 20:50:27 +0000 (20:50 +0000)]
Merge "Mark isInUse per-window" into mnc-dev
Fyodor Kupolov [Tue, 21 Jul 2015 20:50:24 +0000 (20:50 +0000)]
am
55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
* commit '
55a116d00ca3f7b84a6af1c5c3472323ad5bc6ca':
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
Fyodor Kupolov [Tue, 21 Jul 2015 20:32:25 +0000 (20:32 +0000)]
Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
Amith Yamasani [Tue, 21 Jul 2015 20:18:02 +0000 (20:18 +0000)]
am
09ba7151: Merge "Don\'t kill apps that are multi-user aware..." into mnc-dev
* commit '
09ba71513ba3bb092eb3effbe45953c50430ff20':
Don't kill apps that are multi-user aware...
Amith Yamasani [Tue, 21 Jul 2015 20:04:19 +0000 (20:04 +0000)]
Merge "Don't kill apps that are multi-user aware..." into mnc-dev
Alex Klyubin [Tue, 21 Jul 2015 20:02:21 +0000 (20:02 +0000)]
am
5d586dd5: Merge "KM module may consume less input than provided by finish time." into mnc-dev
* commit '
5d586dd585a6663290b68abce433a75b5760fc5d':
KM module may consume less input than provided by finish time.
Alex Klyubin [Tue, 21 Jul 2015 19:50:47 +0000 (19:50 +0000)]
Merge "KM module may consume less input than provided by finish time." into mnc-dev
Adam Lesinski [Tue, 21 Jul 2015 19:40:24 +0000 (19:40 +0000)]
am
23e19066: Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
* commit '
23e19066de2caf1db1fa0759ac49a1118b59f7a5':
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
Jorim Jaggi [Mon, 20 Jul 2015 22:51:40 +0000 (15:51 -0700)]
Add callback to voice interaction session for lockscreen shown
Bug:
22402726
Change-Id: Iaf83e2f2b0389d74b6ecf480aa91a34443803f7b
Christopher Tate [Tue, 21 Jul 2015 19:28:04 +0000 (19:28 +0000)]
am
d9c2ff99: Merge "Add \'pm\' operation to set a package\'s app-linking state" into mnc-dev
* commit '
d9c2ff99bf9469f155eabf341880d055741e9db5':
Add 'pm' operation to set a package's app-linking state
Adam Lesinski [Tue, 21 Jul 2015 19:26:43 +0000 (19:26 +0000)]
Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev
Svetoslav [Tue, 21 Jul 2015 19:12:13 +0000 (19:12 +0000)]
am
81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
* commit '
81adda25b396ee3db794bc9a7946b579d01c2aa0':
Always create nodes for views backed by an adapter.
Christopher Tate [Tue, 21 Jul 2015 19:11:34 +0000 (19:11 +0000)]
Merge "Add 'pm' operation to set a package's app-linking state" into mnc-dev
Adam Lesinski [Tue, 21 Jul 2015 19:08:56 +0000 (12:08 -0700)]
BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources
Previously we tried to read /d/wakeup_sources to gather kernel wakelock data. If that
fails we used the older sys file /proc/wakelocks.
N7 has both /proc/wakelocks and /d/wakeup_sources, but /proc/wakelocks
has the actual data we need. All other devices are using /d/wakeup_sources, so
only N7 experienced a loss of kernel wakelock data.
The original regression was introduced here: ag/659258
Bug:
22556242
Change-Id: I51ec68e957f587bc1466e24f0a1dbc8cd7753ac6
Fyodor Kupolov [Tue, 21 Jul 2015 18:48:18 +0000 (11:48 -0700)]
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
Bug:
21521860
Change-Id: I0c2659f84589a77432317fbc89d49716027577d3
Svetoslav [Tue, 21 Jul 2015 19:01:05 +0000 (19:01 +0000)]
Merge "Always create nodes for views backed by an adapter." into mnc-dev
Svet Ganov [Tue, 21 Jul 2015 18:52:21 +0000 (11:52 -0700)]
Update permission icons to final versions - framework
bug:
22383613
Change-Id: I3f524fd0538a1b843b0394fa766f032835d1ecaa
Amith Yamasani [Tue, 21 Jul 2015 18:46:14 +0000 (11:46 -0700)]
Don't kill apps that are multi-user aware...
... when looking for background user apps that hold RECORD_AUDIO
permission.
On switching users, we kill any apps that might potentially be
recording audio. But we don't want to kill critical apps that need
to stay running because of multi-user aware services.
Bug:
22564430
Change-Id: I6d9a684d4e044cc3018f0f8181a44aa143a3baeb
Todd Kennedy [Tue, 21 Jul 2015 18:21:33 +0000 (18:21 +0000)]
am
f2805bcb: Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
* commit '
f2805bcbe1c99ce806448a2d8c0f12b142c7cece':
Use RingtonePlayer to get ringtone title
Todd Kennedy [Tue, 21 Jul 2015 18:11:16 +0000 (18:11 +0000)]
Merge "Use RingtonePlayer to get ringtone title" into mnc-dev
John Reck [Tue, 21 Jul 2015 17:23:59 +0000 (10:23 -0700)]
Mark isInUse per-window
Bug:
22509159
Change-Id: I0ae0f1fa582ee38dcb9f24ca20f0b4d0c57ccb32
Nick Kralevich [Tue, 21 Jul 2015 17:25:30 +0000 (17:25 +0000)]
am
673ccfd4: Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
* commit '
673ccfd45a81482d97eecf76dc0fef0dfd57be73':
UsbDeviceManager: add back support for USB overlays
Kenny Guy [Mon, 20 Jul 2015 15:56:28 +0000 (16:56 +0100)]
Support waiting for adb shell am stop-user to complete.
Use stop user callback to wait for AM.stopUser to complete
if -w flag is passed to adb shell am stop-user
bug:
22599411
Change-Id: I8adbfdbb1ba69a88a67431da65f0a85035587c2d
Nick Kralevich [Tue, 21 Jul 2015 17:16:07 +0000 (17:16 +0000)]
Merge "UsbDeviceManager: add back support for USB overlays" into mnc-dev
Raph Levien [Tue, 21 Jul 2015 17:04:36 +0000 (17:04 +0000)]
am
1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
* commit '
1fcb6d3ae27ac95388eb036d124bd4bd0c6559cc':
Respect style boundaries when measuring text
Raph Levien [Tue, 21 Jul 2015 16:55:37 +0000 (16:55 +0000)]
Merge "Respect style boundaries when measuring text" into mnc-dev
Diego Perez [Tue, 21 Jul 2015 15:50:11 +0000 (15:50 +0000)]
am
66e66831: Merge "resolved conflicts for merge of
112d8a36 to mnc-dev" into mnc-dev
* commit '
66e6683193f6a1d071710ea8a39b02f5129fc505':
Render to measured size when using expand mode
Diego Perez [Tue, 21 Jul 2015 15:41:08 +0000 (15:41 +0000)]
Merge "resolved conflicts for merge of
112d8a36 to mnc-dev" into mnc-dev
Wale Ogunwale [Tue, 21 Jul 2015 14:38:04 +0000 (14:38 +0000)]
am
e99f20f5: Merge "Don\'t duplicate recent tasks of the same affinity." into mnc-dev
* commit '
e99f20f5873c00b35f2407e28e06ff9119f85088':
Don't duplicate recent tasks of the same affinity.
Diego Perez [Tue, 21 Jul 2015 14:28:10 +0000 (15:28 +0100)]
resolved conflicts for merge of
112d8a36 to mnc-dev
Change-Id: Ic9511a57db8a96f54dba0704800789a8602b9dd2
Wale Ogunwale [Tue, 21 Jul 2015 14:28:13 +0000 (14:28 +0000)]
Merge "Don't duplicate recent tasks of the same affinity." into mnc-dev
Wale Ogunwale [Mon, 20 Jul 2015 22:43:37 +0000 (15:43 -0700)]
Don't duplicate recent tasks of the same affinity.
In change
510e554283d3dc250f836cd3e4abc36d87319333 we stated
limiting the number of document activity entries in recents
by comparing the realActivity of the tasks. This compared was
done for all tasks not just document tasks there by breaking
the use of task affinity to remove tasks with the same affinity
from recent task list. This change limits the compare of
realActivity to just document tasks.
Bug:
22564474
Bug:
18642190
Change-Id: Idc21ec311f194ab2005cb22380ca56303ae0ad94
Jason Monk [Tue, 21 Jul 2015 14:18:01 +0000 (10:18 -0400)]
Fix blank tiles on QS rotate
Some tiles were skipping updates due to lack of information, make
these tiles handle a clear state better.
Bug:
22531578
Change-Id: I7bd75b3e032592a496fcaf080ce9cbe3b5cf20da
Diego Perez [Tue, 21 Jul 2015 13:20:23 +0000 (13:20 +0000)]
am
d6f2a9ef: am
7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev
* commit '
d6f2a9efbb0e0525f6cf970fd9c9b9b7082b19f9':
Render to measured size when using expand mode
Diego Perez [Tue, 21 Jul 2015 13:06:52 +0000 (13:06 +0000)]
am
7720eb18: Merge "Render to measured size when using expand mode" into lmp-mr1-dev
* commit '
7720eb18c1c2fe06e8f4b2f6e2936a4072494da8':
Render to measured size when using expand mode
Diego Perez [Tue, 21 Jul 2015 12:56:50 +0000 (12:56 +0000)]
Merge "Render to measured size when using expand mode" into lmp-mr1-dev
Christopher Tate [Mon, 20 Jul 2015 22:39:39 +0000 (15:39 -0700)]
Add 'pm' operation to set a package's app-linking state
Set an app's state:
pm set-app-link [--user USER_ID] PACKAGE {always|ask|never|undefined}
Read an app's current state:
pm get-app-link [--user USER_ID] PACKAGE
The latter prints to stdout one of the strings usable as an argument to
set-app-link. If an error is encountered, the string printed to
stderr begins with "Error: ".
Bug
19628527
Change-Id: I68b6dc24445917807345a8cf5baa2078490740af
Todd Kennedy [Mon, 20 Jul 2015 20:32:40 +0000 (13:32 -0700)]
Use RingtonePlayer to get ringtone title
Instead of requiring every application that calls Rintone.getTitle()
to request android.permission.READ_EXTERNAL_STORAGE, pass the call
through to the system UI process. We only do this for media store
URIs.
Bug:
22067670
Change-Id: I38cf3fb8d769ef6984c41a7b04afbbd4c57175ce
Jae Seo [Tue, 21 Jul 2015 00:10:47 +0000 (00:10 +0000)]
am
b2eed1d6: Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev
* commit '
b2eed1d6e11f38c00ce1776ade14dfa004c6119f':
TIF: Get or create the user state when failed to find existing one
Terry Heo [Tue, 21 Jul 2015 00:10:43 +0000 (00:10 +0000)]
am
e95af4ab: Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev
* commit '
e95af4ab8bda68ee80bf4d444356e0c1afb1fe99':
TIF: Use copied track list for onTracksChanged() callback
Jae Seo [Mon, 20 Jul 2015 23:59:22 +0000 (23:59 +0000)]
Merge "TIF: Get or create the user state when failed to find existing one" into mnc-dev
Terry Heo [Mon, 20 Jul 2015 23:57:28 +0000 (23:57 +0000)]
Merge "TIF: Use copied track list for onTracksChanged() callback" into mnc-dev
Dongwon Kang [Mon, 20 Jul 2015 23:56:37 +0000 (23:56 +0000)]
am
6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev
* commit '
6444fe121449f1cacf4500d3098b590c74e3646d':
MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
Jorim Jaggi [Mon, 20 Jul 2015 23:56:33 +0000 (23:56 +0000)]
am
55786e11: Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
* commit '
55786e1164d522d878d1f493c30330669b1fd868':
Test app to emit all AccessibilityEvents to logcat.
Jorim Jaggi [Thu, 9 Jul 2015 19:13:59 +0000 (12:13 -0700)]
Touch, wake and unlock
- Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent
the device from sleeping.
- If we get a successful fingerprint, wake the device up, immediately
dismiss the keyguard and tell PWM that we kicked off our frame that
will represent the correct state.
- PWM then waits for this frame to be drawn, and then turns on the
screen, which results in unlocking directly to the previsouly
opened app.
Bug:
21855614
Change-Id: I5f43df17fa5e4e9c6a6392eef4a4590b07df4f96
Dongwon Kang [Mon, 20 Jul 2015 23:49:59 +0000 (23:49 +0000)]
Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev
Jorim Jaggi [Mon, 20 Jul 2015 23:45:46 +0000 (23:45 +0000)]
am
1f98c62f: Fix unnecessary layer creation for appear animation
* commit '
1f98c62f9a60fedd8f18bd47e3f3c4e5fcb34031':
Fix unnecessary layer creation for appear animation
Miao Wang [Mon, 20 Jul 2015 23:45:42 +0000 (23:45 +0000)]
am
15d68941: Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev
* commit '
15d6894170f2ee1a6eae57c915fcc27a56c9de17':
[RenderScript] Add docs advising users about dstAtop bug.
Jorim Jaggi [Mon, 20 Jul 2015 23:45:37 +0000 (23:45 +0000)]
am
4cd72169: Fix window animation flickering
* commit '
4cd7216967a3e6211785c8acdeca449d61d796a0':
Fix window animation flickering
Jorim Jaggi [Mon, 20 Jul 2015 23:43:48 +0000 (23:43 +0000)]
Merge "Test app to emit all AccessibilityEvents to logcat." into mnc-dev
Jorim Jaggi [Mon, 20 Jul 2015 18:43:27 +0000 (11:43 -0700)]
Fix unnecessary layer creation for appear animation
Bug:
22561692
Change-Id: I9e5a52f8113d1cbb5afba61d7979770c2dddc5ed
Jeff Sharkey [Mon, 20 Jul 2015 23:36:55 +0000 (16:36 -0700)]
Avoid NPE when no staged installs.
listFiles() returns null instead of empty list; deal with it.
Bug:
22608671
Change-Id: I60dabec31932af3cded915c6927a4c5e5c71775d
Miao Wang [Mon, 20 Jul 2015 23:37:44 +0000 (23:37 +0000)]
Merge "[RenderScript] Add docs advising users about dstAtop bug." into mnc-dev
Jorim Jaggi [Mon, 20 Jul 2015 18:54:26 +0000 (11:54 -0700)]
Fix window animation flickering
Bug:
22502673
Change-Id: I939e5840e10f3c0582148a5a01908076f994ae69
Jorim Jaggi [Mon, 20 Jul 2015 23:24:21 +0000 (23:24 +0000)]
am
8924f23d: Merge "Fix SysUI crashes on svelte devices" into mnc-dev
* commit '
8924f23d3ecdcb2b1ce4dbc9bb4fbb9ddfa62710':
Fix SysUI crashes on svelte devices
Raph Levien [Mon, 20 Jul 2015 23:22:01 +0000 (16:22 -0700)]
Respect style boundaries when measuring text
The existing implementation of handleText() in TextLine laid out
text to the end of the context. However, in cases where the text is
broken into multiple style spans, it's only valid to lay out up to
the end of the style span. This can lead to inconsistent
measurements, especially in the presence of legitimate zero-width
characters such as bidi control characters and zero width space.
This patch changes the invocation of getRunAdvance to measure only
within the style span.
Bug:
22589743
Change-Id: I027f5e77db27ddf9596ef20adcad7e62a82b41de
Jae Seo [Mon, 20 Jul 2015 23:15:01 +0000 (16:15 -0700)]
TIF: Get or create the user state when failed to find existing one
Bug:
22560640
Change-Id: Idc56dc2b16319d173f005fc236f91f70d1a93fad
Jorim Jaggi [Mon, 20 Jul 2015 23:09:44 +0000 (23:09 +0000)]
Merge "Fix SysUI crashes on svelte devices" into mnc-dev
Miao Wang [Mon, 20 Jul 2015 22:05:31 +0000 (15:05 -0700)]
[RenderScript] Add docs advising users about dstAtop bug.
Bug:
22047392
Change-Id: I736a697276020687c20dff515aabb1be1776f8c0
Dongwon Kang [Mon, 20 Jul 2015 22:59:53 +0000 (15:59 -0700)]
MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
AudioSystem.isStreamActive() includes a blocking IPC, so it shouldn't be called
in MSR.adjustVolume() which is called from MediaSessionService while holding a
lock.
Bug:
22606983
Change-Id: I3ab94e73731176d9bf80dbc2121702025547114c
Alan Viverette [Mon, 20 Jul 2015 22:59:37 +0000 (22:59 +0000)]
am
41668b25: Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
* commit '
41668b259dfa997492e3f4d331fee88b7f9f2453':
Adjust padding and font size in time picker for Large text mode
Alan Viverette [Mon, 20 Jul 2015 22:59:33 +0000 (22:59 +0000)]
am
001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
* commit '
001f1e7eb35630df24d53298c1a3d2de055d7ce9':
Add missing invalidation check to drawable cache
Alan Viverette [Mon, 20 Jul 2015 22:48:26 +0000 (22:48 +0000)]
Merge "Adjust padding and font size in time picker for Large text mode" into mnc-dev
Jorim Jaggi [Mon, 20 Jul 2015 21:44:55 +0000 (14:44 -0700)]
Fix SysUI crashes on svelte devices
Bug:
22602295
Change-Id: Idac0d62683c0f6f7cf7b795967632e34d771c4f7
Alan Viverette [Mon, 20 Jul 2015 22:44:30 +0000 (22:44 +0000)]
Merge "Add missing invalidation check to drawable cache" into mnc-dev
Simranjit Singh Kohli [Mon, 20 Jul 2015 22:44:18 +0000 (22:44 +0000)]
am
02aff29c: Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after cleari
* commit '
02aff29c396373acc16be159c8c4ed59f61faaed':
[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity.
Dianne Hackborn [Mon, 20 Jul 2015 22:44:13 +0000 (22:44 +0000)]
am
a7ce2344: Merge "Fix issue #
22564918: Request is inactive" into mnc-dev
* commit '
a7ce23440328e63f36a4add05199aa84ff04032d':
Fix issue #
22564918: Request is inactive
Nick Kralevich [Mon, 20 Jul 2015 22:36:21 +0000 (15:36 -0700)]
UsbDeviceManager: add back support for USB overlays
Commit
fcf10f7c12cb3107bdfedce6f76a8c866d154f3c removed support for USB
overlays. Add it back in, as some devices depend on it.
Bug:
22062484
Bug:
21195124
Change-Id: I74d12699201355b07475744c641e31fdc4bb5a4a
Simranjit Singh Kohli [Mon, 20 Jul 2015 22:39:49 +0000 (22:39 +0000)]
Merge "[Fix MANAGE_USER permission in AccountManagerService] It seems that curently there were situations where the init of Accounts in cache could trigger MANAGE_USER permission needed errors. The callers should make sure they are calling it after clearing identity." into mnc-dev
Dianne Hackborn [Mon, 20 Jul 2015 22:34:46 +0000 (22:34 +0000)]
Merge "Fix issue #
22564918: Request is inactive" into mnc-dev