OSDN Git Service
Winson Chung [Thu, 3 Dec 2015 22:57:06 +0000 (22:57 +0000)]
Merge changes I1e345044,I8c00aba3,I91536ce4
* changes:
Fixing crash when the focused task was removed.
Freeform workspace fixes
Fixing jump when second finger touches the stack.
Jeff Sharkey [Thu, 3 Dec 2015 22:36:07 +0000 (22:36 +0000)]
Merge "Attempt to unlock users with null token."
Jeff Sharkey [Thu, 3 Dec 2015 22:23:08 +0000 (15:23 -0700)]
Attempt to unlock users with null token.
When starting a locked user, try unlocking their storace will a null
token, which will typically succeed if there is an insecure
lockscreen (no PIN or pattern).
For users with a secure lockscreen, pass through a stub token for
now to indicate that it came from a user challenge. Eventually we'll
hook that up to gatekeeperd.
Without this, we were only unlocking users with secure lockscreens.
Bug:
25943941
Change-Id: Ia0324d50f43f55dfe0b8366793ddc5d25d885922
Winson [Thu, 3 Dec 2015 20:02:38 +0000 (12:02 -0800)]
Fixing crash when the focused task was removed.
- The previous fix didn’t work when the stack changed and the focused
task indices shifted. It’s easier to just keep track of the focused
task so that we can clean it up directly.
Bug:
25975225
Change-Id: I1e345044165d3a0a5eab29fb8c2a3f59df615832
Winson [Thu, 3 Dec 2015 18:55:01 +0000 (10:55 -0800)]
Freeform workspace fixes
- Fixing issue with the wrong task view index being calculated for
freeform workspace tasks causing them to be invisible when dragged
to the stack
- Reducing unnecessary detach/reattach calls for freeform tasks
- Adding freeform workspace background to match exit to home animation
Change-Id: I8c00aba377601da92195ef301ba5da1ffb0045c5
Winson [Thu, 3 Dec 2015 18:07:52 +0000 (10:07 -0800)]
Fixing jump when second finger touches the stack.
Change-Id: I91536ce49d04bc13cbd54f230139592d1d3a3cf1
Winson Chung [Thu, 3 Dec 2015 22:23:47 +0000 (22:23 +0000)]
Merge "Adding workaround to prevent flicker in Recents when resizing."
Winson [Thu, 3 Dec 2015 22:03:07 +0000 (14:03 -0800)]
Adding workaround to prevent flicker in Recents when resizing.
Change-Id: Id5b12e1208f2a624b386c2388081565205aeca54
Alex Klyubin [Thu, 3 Dec 2015 21:33:44 +0000 (21:33 +0000)]
Merge "Stop using 512 bit RSA keys in keyset unit tests." am:
59c9bfd41b am:
b1e7f6d287
am:
64868d11dd
* commit '
64868d11dd1597267631bc6b519c1eacbfd90396':
Stop using 512 bit RSA keys in keyset unit tests.
Keun-young Park [Thu, 3 Dec 2015 21:31:23 +0000 (21:31 +0000)]
Merge "allow locking UI mode and block launching car dock for automotive"
Alan Viverette [Thu, 3 Dec 2015 21:27:07 +0000 (21:27 +0000)]
Merge "Ensure only one context menu is shown at a time"
Alex Klyubin [Thu, 3 Dec 2015 21:26:05 +0000 (21:26 +0000)]
Merge "Stop using 512 bit RSA keys in keyset unit tests." am:
59c9bfd41b
am:
b1e7f6d287
* commit '
b1e7f6d2870ca59f582671bdacf78efc52028bbc':
Stop using 512 bit RSA keys in keyset unit tests.
Alex Klyubin [Thu, 3 Dec 2015 21:18:38 +0000 (21:18 +0000)]
Merge "Stop using 512 bit RSA keys in keyset unit tests."
am:
59c9bfd41b
* commit '
59c9bfd41bfe7d897a1a5d2e35d8dd48322c9865':
Stop using 512 bit RSA keys in keyset unit tests.
Alex Klyubin [Thu, 3 Dec 2015 21:10:46 +0000 (21:10 +0000)]
Merge "Stop using 512 bit RSA keys in keyset unit tests."
keunyoung [Wed, 23 Sep 2015 18:33:58 +0000 (11:33 -0700)]
allow locking UI mode and block launching car dock for automotive
- add config to lock UI mode change: When this is enabled,
request to change car mode will be ignored. Apps can check
the config using UiModeManager.isUiModeLocked()
- add config to lock day / night mode: When this is enabled,
apps cannot change day / night mode without having
MODIFY_DAY_NIGHT_MODE permission.
Apps can check the config using UiModeManager.isNightModeLocked()
- add config to disable car dock intent launch for home key
and mode change
- All new configs have default values which keeps the current behavior.
Car products should override the configs to get desirable behavior.
bug:
22700993
Change-Id: Ic0e58f3428151e0b1c19a2e9a7d6ded32ff962a6
Jeff Sharkey [Thu, 3 Dec 2015 21:05:17 +0000 (21:05 +0000)]
Merge "Flesh out user locked/unlocked lifecycle."
Christine Hallstrom [Thu, 3 Dec 2015 21:00:30 +0000 (21:00 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am:
7fb263c472 am:
67d068b5ec am:
9355a0420e
am:
c1a79e7bd2
* commit '
c1a79e7bd2061c025fd88529800db7358c39ed14':
Log API calls to createBond(), cancelBondProcess(), removeBond()
Jeff Sharkey [Wed, 2 Dec 2015 23:42:25 +0000 (16:42 -0700)]
Flesh out user locked/unlocked lifecycle.
When a user is first started, we assume that they're "locked" meaning
that credential-encrypted data is unavailable. Once credentials have
been supplied, we can transition the user to a fully running state.
To facilitate this lifecycle, UserState now has two separate
RUNNING_LOCKED and RUNNING states. To ensure consistent events are
sent on all devices, we always step through RUNNING_LOCKED before
arriving at RUNNING. This consistency means that apps processing
data based on the new ACTION_LOCKED_BOOT_COMPLETED broadcast and
system services using the new onUnlockUser() event will be less
bug-prone over time.
If the user storage is unlocked (which is the case on the majority
of legacy devices), we immediately transition from the RUNNING_LOCKED
into the RUNNING state.
Add logging for all state transitions.
When we "recover" a user in the process of being shut down, return
to the last known state.
Bug:
25943941
Change-Id: I5fec980f10b0d0fb2c272a662d193dc15136f9b9
Christine Hallstrom [Thu, 3 Dec 2015 20:52:44 +0000 (20:52 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am:
7fb263c472 am:
67d068b5ec
am:
9355a0420e
* commit '
9355a0420e3324ae42ac1a5ca108730c5990dcbf':
Log API calls to createBond(), cancelBondProcess(), removeBond()
Alex Klyubin [Thu, 3 Dec 2015 20:52:23 +0000 (12:52 -0800)]
Stop using 512 bit RSA keys in keyset unit tests.
This switches keyset unit tests from two unrealistically short 512 bit
RSA keys to a more realistic 2048 bit RSA key and a NIST P-256 EC key.
Change-Id: If615b97dff22a2a4f7f0e6015e410e98b8d395cd
Christine Hallstrom [Thu, 3 Dec 2015 20:42:35 +0000 (20:42 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev am:
7fb263c472
am:
67d068b5ec
* commit '
67d068b5ec7ca3739047f0c5a162f9317171f784':
Log API calls to createBond(), cancelBondProcess(), removeBond()
Christine Hallstrom [Thu, 3 Dec 2015 20:35:39 +0000 (20:35 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev
am:
7fb263c472
* commit '
7fb263c472c9df98410b2b9dfe72e093e2d594e0':
Log API calls to createBond(), cancelBondProcess(), removeBond()
Christine Hallstrom [Thu, 3 Dec 2015 20:32:05 +0000 (20:32 +0000)]
Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev
Winson Chung [Thu, 3 Dec 2015 20:11:52 +0000 (20:11 +0000)]
Merge "Temporary workaround for b/
25980198"
Andy Hung [Thu, 3 Dec 2015 20:02:01 +0000 (20:02 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c am:
7c798c13a7 am:
94cefd6adb am:
a30685ef8d am:
ae4b789619
am:
b0545b6b1e -s ours
* commit '
b0545b6b1ef4550b03c3de8cde1e72f9b31ee6cb':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Yohei Yukawa [Thu, 3 Dec 2015 20:01:03 +0000 (20:01 +0000)]
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
Yohei Yukawa [Thu, 3 Dec 2015 20:00:30 +0000 (20:00 +0000)]
Merge "Fix special handling of a fake language code "tl"." am:
9fd2af6b32 am:
30e321b54a
am:
d42df4f68e
* commit '
d42df4f68e16bc3800d4d944caddbcbe79986fe8':
Fix special handling of a fake language code "tl".
Winson [Thu, 3 Dec 2015 18:59:07 +0000 (10:59 -0800)]
Fixing typo in history check.
Change-Id: Icad0d8f18951dd09c4acb7b4dfb09c019368c0a5
Winson [Thu, 3 Dec 2015 19:35:25 +0000 (11:35 -0800)]
Fixing regression when animating in new views after dismissing task.
- In the old stack, the range of stack task progress was 0..1, but now
it needs to be offset by the stack range.
Change-Id: I21cb5c7c8c3cc3648867626a516de9ab01e704c8
Andy Hung [Thu, 3 Dec 2015 19:55:32 +0000 (19:55 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c am:
7c798c13a7 am:
94cefd6adb am:
a30685ef8d
am:
ae4b789619
* commit '
ae4b7896195727dfd8d00b90f25074206bf21775':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:50:25 +0000 (19:50 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c am:
7c798c13a7 am:
94cefd6adb
am:
a30685ef8d
* commit '
a30685ef8dcaa18b2561c17cfbbb48044adb2d27':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:42:45 +0000 (19:42 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c am:
7c798c13a7
am:
94cefd6adb
* commit '
94cefd6adb7cf464e4765faaba001071b543517b':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Andy Hung [Thu, 3 Dec 2015 19:34:01 +0000 (19:34 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am:
0a887bcd5c
am:
7c798c13a7
* commit '
7c798c13a7c36f3c8877f410ecf5552e1b385805':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Felipe Leme [Thu, 3 Dec 2015 19:30:29 +0000 (19:30 +0000)]
Merge "Improved helper used to choose an activity."
Christopher Wiley [Thu, 3 Dec 2015 19:28:38 +0000 (19:28 +0000)]
Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" am:
0ded0da517 am:
4ff2cc0898
am:
d295e94dad
* commit '
d295e94dade5123354761c5f2577913799b5b2c5':
Map Errors.h's UNEXPECTED_NULL to NullPointerException
Andy Hung [Thu, 3 Dec 2015 19:24:02 +0000 (19:24 +0000)]
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
am:
0a887bcd5c
* commit '
0a887bcd5c5a8056735d221ad71afcff1f6eb1a6':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Chris Wren [Thu, 3 Dec 2015 19:23:33 +0000 (19:23 +0000)]
Merge "Notification Assistant API"
Jeff Sharkey [Thu, 3 Dec 2015 19:22:30 +0000 (19:22 +0000)]
Merge "Avoid a double decrease of reference counter for unstable provider" am:
e8651aed4b am:
aae0a49c16
am:
a9c2218940
* commit '
a9c22189404b5cb1f4e66ca3ff99ed8e04403f1e':
Avoid a double decrease of reference counter for unstable provider
Jeff Sharkey [Thu, 3 Dec 2015 19:20:55 +0000 (19:20 +0000)]
Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master am:
67003be3f8
am:
c32406e85b
* commit '
c32406e85b8e2a454c96d5ddfb1b494d8853879c':
Jeff Sharkey [Thu, 3 Dec 2015 19:19:34 +0000 (19:19 +0000)]
Merge branch \'mnc-dr2-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr2-dev-plus-aosp
am:
5ee15f0be3
* commit '
5ee15f0be3fcc148335ff53319aac9ba9723dcf8':
Yohei Yukawa [Thu, 3 Dec 2015 19:18:45 +0000 (19:18 +0000)]
Merge "Fix special handling of a fake language code "tl"." am:
9fd2af6b32
am:
30e321b54a
* commit '
30e321b54a589d33dc7f2dd7344bef95faaaf83d':
Fix special handling of a fake language code "tl".
Jeff Sharkey [Thu, 3 Dec 2015 19:18:15 +0000 (19:18 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am:
29e0b6e789 am:
af588a31bc
am:
630f658108
* commit '
630f65810860cbd15012a1d5e83a275695e332cd':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 19:16:45 +0000 (19:16 +0000)]
Merge "Fix race condition when collecting op callback." am:
98844a97d2 am:
678011854b
am:
28d8b8c988
* commit '
28d8b8c9882e501f95ec3076a4f1fffc759ea999':
Fix race condition when collecting op callback.
Jeff Sharkey [Thu, 3 Dec 2015 19:15:12 +0000 (19:15 +0000)]
Merge "Improved variable naming" am:
4ef9d41066 am:
bc57510e9f
am:
ec0e46fbc6
* commit '
ec0e46fbc612cb9575ae3e7901664cd34666f438':
Improved variable naming
George Mount [Thu, 3 Dec 2015 19:11:11 +0000 (19:11 +0000)]
Merge "Revert "Give transitioning fragment a context prior to retrieving transition""
Yohei Yukawa [Thu, 3 Dec 2015 19:10:30 +0000 (19:10 +0000)]
Merge "Fix special handling of a fake language code "tl"."
am:
9fd2af6b32
* commit '
9fd2af6b323ef98695701a8bcfdd3ca1c4dd7965':
Fix special handling of a fake language code "tl".
George Mount [Thu, 3 Dec 2015 19:10:08 +0000 (19:10 +0000)]
Merge "Revert "Choose the correct Fragment to pull a Transiton from.""
George Mount [Thu, 3 Dec 2015 19:09:59 +0000 (19:09 +0000)]
Revert "Give transitioning fragment a context prior to retrieving transition"
This reverts commit
2b2d23aa706c2d8efb05e15f08bdc41883a4a651.
Change-Id: Ib3010b4ba3c3d003d5143d9ea63d331c9c2d304e
Felipe Leme [Thu, 3 Dec 2015 19:09:53 +0000 (11:09 -0800)]
Improved helper used to choose an activity.
- Decrease delay by first checking if the activity is the default
selection.
- Handle scrolling so it won't fail if the activity is not visible.
Change-Id: I8fce920bad207c3f35375316a139f20c1dcb9343
George Mount [Thu, 3 Dec 2015 19:09:17 +0000 (19:09 +0000)]
Revert "Choose the correct Fragment to pull a Transiton from."
This reverts commit
fbaa14bc35e8d7366596053cac8a445084bac44c.
Change-Id: Ic6953554a97bf125a69209b1db973d7fc48ab31b
Christine Hallstrom [Tue, 17 Nov 2015 20:24:07 +0000 (12:24 -0800)]
Log API calls to createBond(), cancelBondProcess(), removeBond()
In an attempt to better be able to debug Bluetooth-related parts of
the system, add info-level logging including calling process and
thread whenever the aforementioned functions are called.
Bug:
25996120
Change-Id: I5a72b2ab929f805ec1c43cc54879ed079a8dfe34
Yohei Yukawa [Thu, 3 Dec 2015 19:04:24 +0000 (19:04 +0000)]
Merge "Fix special handling of a fake language code "tl"."
Chris Tate [Thu, 3 Dec 2015 19:00:47 +0000 (19:00 +0000)]
Merge "Improve docs for Parcelable.describeContents()"
Wale Ogunwale [Thu, 3 Dec 2015 18:51:13 +0000 (18:51 +0000)]
Merge "Set proper stack in WM when activity is moved to stack in AM"
Chris Wren [Fri, 20 Nov 2015 21:44:53 +0000 (16:44 -0500)]
Notification Assistant API
This API allows a single assistant on the device to help the
user manage their notification stream by taking actions on
individual notifications:
- modifying their priority up or down when they are posted
- possibly changing if and how the notification interrupts the user
- adding annotations under notifications
Bug:
22455414
Change-Id: Idf47972bb71c83f1dc1c9ec68a6fa92ac4fc522f
George Mount [Thu, 3 Dec 2015 18:38:48 +0000 (18:38 +0000)]
Adds a way to exclude test directories from javadoc. am:
f6be993407
am:
c26d7c378a
* commit '
c26d7c378a58f4f312b8385baf4d318c2df35478':
Adds a way to exclude test directories from javadoc.
George Mount [Thu, 3 Dec 2015 18:29:46 +0000 (18:29 +0000)]
Adds a way to exclude test directories from javadoc.
am:
f6be993407
* commit '
f6be99340769cae717a604c7362f85830e4601c6':
Adds a way to exclude test directories from javadoc.
Adam Skory [Thu, 3 Dec 2015 18:29:05 +0000 (18:29 +0000)]
Merge "Make isAppProvidedWebUri false from setDefaultIntent()"
Wale Ogunwale [Thu, 3 Dec 2015 03:46:29 +0000 (19:46 -0800)]
Set proper stack in WM when activity is moved to stack in AM
When an activity is moved to a stack using the
ActivityStack#moveActivityToStack API a new task is created to
hold the activity in the stack. However, when the new task is
created in the window manager side it uses the stack id of the
previous stack the activity was in. We now pass the stack to use
from activity manager to window manager.
Bug:
25987309
Bug:
25961636
Change-Id: Iecc71f6d9b3e70a8d88e134b42f7532ba5327bad
George Mount [Thu, 3 Dec 2015 15:39:55 +0000 (07:39 -0800)]
Adds a way to exclude test directories from javadoc.
By adding a file named NO_DOCS to a directory, all
java files under that directory will be ignored for
javadoc builds. This is especially useful for marking
test projects as not participating in the javadoc
build.
Change-Id: I3b0259f4bb3c8460c3560fdcf97c6cac11d8001d
Christopher Wiley [Thu, 3 Dec 2015 17:54:08 +0000 (17:54 +0000)]
Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" am:
0ded0da517
am:
4ff2cc0898
* commit '
4ff2cc0898891488dce3917d105f15264b7742ce':
Map Errors.h's UNEXPECTED_NULL to NullPointerException
Christopher Wiley [Thu, 3 Dec 2015 17:46:58 +0000 (17:46 +0000)]
Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException"
am:
0ded0da517
* commit '
0ded0da51743a24707bece4b0be05f49db3b9981':
Map Errors.h's UNEXPECTED_NULL to NullPointerException
Christopher Wiley [Thu, 3 Dec 2015 17:43:43 +0000 (17:43 +0000)]
Merge "Map Errors.h's UNEXPECTED_NULL to NullPointerException"
Jeff Sharkey [Thu, 3 Dec 2015 17:16:30 +0000 (17:16 +0000)]
Merge "Avoid a double decrease of reference counter for unstable provider" am:
e8651aed4b
am:
aae0a49c16
* commit '
aae0a49c164e9eeb19d46967c84697cd1a3a6783':
Avoid a double decrease of reference counter for unstable provider
Jeff Sharkey [Thu, 3 Dec 2015 17:15:06 +0000 (17:15 +0000)]
Merge branch \'stage-aosp-master\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
am:
67003be3f8
* commit '
67003be3f8a53c1d11d130d53d866255bd04d2c7':
Jeff Sharkey [Thu, 3 Dec 2015 17:14:11 +0000 (17:14 +0000)]
Merge branch 'mnc-dr2-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr2-dev-plus-aosp
Jeff Sharkey [Thu, 3 Dec 2015 17:13:43 +0000 (17:13 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am:
29e0b6e789
am:
af588a31bc
* commit '
af588a31bc62b791014b3cc4e655107e9446e3d0':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 17:12:41 +0000 (17:12 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks" am:
29e0b6e789
am:
af588a31bc
* commit '
af588a31bc62b791014b3cc4e655107e9446e3d0':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 17:11:22 +0000 (17:11 +0000)]
Merge "Fix race condition when collecting op callback." am:
98844a97d2
am:
678011854b
* commit '
678011854b0969f5fe69d597911beabcadcb03e8':
Fix race condition when collecting op callback.
Jeff Sharkey [Thu, 3 Dec 2015 17:09:59 +0000 (17:09 +0000)]
Merge "Improved variable naming" am:
4ef9d41066
am:
bc57510e9f
* commit '
bc57510e9f359929a55130d8a35c61a84dad4568':
Improved variable naming
Jeff Sharkey [Thu, 3 Dec 2015 17:07:50 +0000 (17:07 +0000)]
Merge "Avoid a double decrease of reference counter for unstable provider"
am:
e8651aed4b
* commit '
e8651aed4b8a2c6703589069e26f5be750b2a947':
Avoid a double decrease of reference counter for unstable provider
Jeff Sharkey [Thu, 3 Dec 2015 17:06:57 +0000 (17:06 +0000)]
Merge branch 'stage-aosp-master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into stage-aosp-master
Jeff Sharkey [Thu, 3 Dec 2015 17:06:24 +0000 (17:06 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am:
29e0b6e789
* commit '
29e0b6e7891091614a9e9dd6083017d0c9d454ae':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 17:05:16 +0000 (17:05 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
am:
29e0b6e789
* commit '
29e0b6e7891091614a9e9dd6083017d0c9d454ae':
StrictMode: fix deserialization of ViolationInfo on large stacks
Jeff Sharkey [Thu, 3 Dec 2015 17:03:53 +0000 (17:03 +0000)]
Merge "Fix race condition when collecting op callback."
am:
98844a97d2
* commit '
98844a97d2bd07146854783374ee3a19aed8edd5':
Fix race condition when collecting op callback.
Jeff Sharkey [Thu, 3 Dec 2015 17:02:21 +0000 (17:02 +0000)]
Merge "Improved variable naming"
am:
4ef9d41066
* commit '
4ef9d41066d8b4124c2c59752512adf24102634d':
Improved variable naming
Jeff Sharkey [Thu, 3 Dec 2015 16:59:58 +0000 (16:59 +0000)]
Merge "Avoid a double decrease of reference counter for unstable provider"
Jeff Sharkey [Thu, 3 Dec 2015 16:59:13 +0000 (16:59 +0000)]
Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"
Jeff Sharkey [Thu, 3 Dec 2015 16:58:34 +0000 (16:58 +0000)]
Merge "Fix race condition when collecting op callback."
Jeff Sharkey [Thu, 3 Dec 2015 16:58:03 +0000 (16:58 +0000)]
Merge "Improved variable naming"
Matt Sarett [Mon, 23 Nov 2015 20:22:39 +0000 (15:22 -0500)]
Change dependency to match renamed libjpeg-turbo
Change-Id: Ie5a88e0e011dc655cff564de28928938112a3073
Clara Bayarri [Tue, 1 Dec 2015 17:38:05 +0000 (17:38 +0000)]
Create a separate Work Challenge check
This allows us to tell lock checks from FBE checks separately,
and will be useful when dealing with password unification.
Change-Id: Ifbea425f749fee4d6d51faddd8b64bf717a1a5f8
Clara Bayarri [Thu, 26 Nov 2015 15:12:19 +0000 (15:12 +0000)]
Apply Admin password restrictions to work profile
When the Work Challenge is in place, re-route the
enforcing of Admin policies on the password to the
work profile. The Admin should not be allowed to
dictate policies on the device lock in this case.
This is part of the Separate Work Challenge feature.
Change-Id: I757973e540797b5fb10bea7a2fd1925561655bc9
Robin Lee [Thu, 3 Dec 2015 16:12:54 +0000 (16:12 +0000)]
Merge "DPMS: Replace ArrayList<>(1) with SingletonList"
Jason Monk [Thu, 3 Dec 2015 15:51:58 +0000 (10:51 -0500)]
Fix crashes in Settings + SUW
Bug:
25981625
Bug:
25989520
Bug:
25987331
Change-Id: Ib53c99edf45bb4550bfb9761ed09ca3677068591
Robin Lee [Thu, 3 Dec 2015 14:52:54 +0000 (14:52 +0000)]
DPMS: Replace ArrayList<>(1) with SingletonList
Change-Id: I78f8230d959f17c3aa2f248122973a8cd5c96693
Jason Monk [Wed, 18 Nov 2015 21:35:14 +0000 (16:35 -0500)]
Allow QS tiles to open dialogs
Add a TYPE_QS_DIALOG window type, that is in the same layer as
apps and dialogs and such. It is guarded by having a token
that is granted by SysUI after a click has occured. If the
app shows a dialog before listening finishes (QS closes) then
the token will stay granted until the tile is removed by the
user, otherwise the token will be removed immediately to avoid
later dialogs.
Also fix a couple tiny TileService issues:
- Stop/Start listening reversed
- Fix javadoc referencing wrong action
Change-Id: Iedcdd5fd9a2af2b33eb7f6f17bb0e6c997879876
Matt Sarett [Thu, 3 Dec 2015 13:38:03 +0000 (13:38 +0000)]
Merge "Merge new implementation of BitmapRegionDecoder."
Clara Bayarri [Thu, 3 Dec 2015 12:04:24 +0000 (12:04 +0000)]
Merge "Create work challenge timeout"
Clara Bayarri [Thu, 29 Oct 2015 15:43:55 +0000 (15:43 +0000)]
Create work challenge timeout
The work challenge should be locked whenever the device goes to sleep + admin
timeout or when the power button is pressed if the lock setting is on.
This change creates the infrastructure to lock a specific user instead of the
device and uses it in these cases. Then, the current code that brings up the
work challenge can check to only show it if the user is locked.
Change-Id: I89b4342b1458d97734d7afa66be52bf04ec3a3d4
Neil Fuller [Thu, 3 Dec 2015 09:44:01 +0000 (09:44 +0000)]
Merge "Fix @code escapes"
Winson [Thu, 3 Dec 2015 03:06:44 +0000 (19:06 -0800)]
Temporary workaround for b/
25980198
Change-Id: I467758ad45c499d72b1756a7e4f5c379089b3049
Winson Chung [Thu, 3 Dec 2015 02:59:50 +0000 (02:59 +0000)]
Merge "Fixing crash when trying to reset focused task after removing task."
Winson [Wed, 2 Dec 2015 23:10:14 +0000 (15:10 -0800)]
Fixing crash when trying to reset focused task after removing task.
- Moving the focused state back into the stack, since the task view
is transient and can be rebound. Also ensuring that we update the
task view focus state as we return and pick up views from the view
pool
- Fixing issue where going back from recents would not go back home
- Properly calculating the task visibility (regression)
Bug:
25975225
Change-Id: Ica861f0d8996e4e254e875199a2d704a65bf8e58
Yohei Yukawa [Thu, 3 Dec 2015 02:22:41 +0000 (18:22 -0800)]
Fix special handling of a fake language code "tl".
My previous CL
92280cd309b0f5967dd253280962d8581844db89 [1] had a silly
mistake that "tl" is converted to "fil" but "tl_PH" is not.
[1] I94f203bddceb9c87710cb187cc3cc0ee6d9092a5
With this CL, the compatibility rewrite-rule from "tl" to "fil" starts
working regardless of the existence of countly/variant subtags in locale
string. So far the only affected platfrom is API Level 23.
Bug:
20696126
Change-Id: Ica9cd2baac002c406f92331aadd7725d7424046a
Winson Chung [Thu, 3 Dec 2015 02:22:15 +0000 (02:22 +0000)]
Merge "Updating the freeform workspace layout"
Winson Chung [Thu, 3 Dec 2015 02:21:44 +0000 (02:21 +0000)]
Merge "Adding notion of stack state to the layout."
Wale Ogunwale [Thu, 3 Dec 2015 02:18:44 +0000 (02:18 +0000)]
Merge "Make sure tap detector is valid before trying to initialize."
Keun-young Park [Thu, 3 Dec 2015 02:11:20 +0000 (02:11 +0000)]
Merge "Revert "allow locking UI mode and block launching car dock for automotive""
Keun-young Park [Thu, 3 Dec 2015 02:11:00 +0000 (02:11 +0000)]
Revert "allow locking UI mode and block launching car dock for automotive"
This reverts commit
1746369a6bcd1a7219e94366b3774bfdfff08fc6.
Change-Id: I4989e99b8f648145d0dbfe18e557102939e7d1e3