223186 Commits

Author SHA1 Message Date
Fyodor Kupolov
680215f502 Merge "Fix instrumentation context initialization" 2015-12-04 00:12:00 +00:00
Chong Zhang
e920098f31 Merge "Fix window disappearing when docking a second app" 2015-12-04 00:06:38 +00:00
Chong Zhang
48a87a5426 Fix window disappearing when docking a second app
When moving app1 to docked stack, the app2 is resized while in background
(fullscreen stack). Because of the config change, mWillReplaceWindow is 
marked true. But since the app2 is in GONE state, all updates of mFrame
are skipped. When it's made visible again, because mWillReplaceWindow is
set, update of mFrame in computeFrameLw() is still skipped, resulting in
wrong mFrame being used.

The fix here is to not set mWillReplaceWindow if the app is not visible,
as we don't need to preserve old window.

Also fix position change check.

bug: 25937471
Change-Id: Iea506296ebd5c2a108368fb2d1d77cdc31a36cdc
2015-12-04 00:02:34 +00:00
Chris Craik
9e50b788a5 Merge "Reorganize hwui test directories" 2015-12-03 23:39:22 +00:00
Yohei Yukawa
50611a8ad7 Merge "Add a test for constructLocaleFromString(String)." 2015-12-03 23:31:44 +00:00
Vineeta Srivastava
8b32eb64b3 Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev am: 9eacc97d71 am: 360930372f
am: 9bbb90383e

* commit '9bbb90383e6d8e78ac68248ff278394b37dc9fb8':
  Set Tether APN protocol type to IPv4 for Telus
2015-12-03 23:27:58 +00:00
Rob Carr
a4740c02e6 Merge "Fix repositionChild positioning." 2015-12-03 23:23:26 +00:00
Yohei Yukawa
226c4bba67 Add a test for constructLocaleFromString(String).
This is a follow up CL for ed65bc0c62ca99a118057db7ad54c4ccc14d52d0 [1],
which fixed special handling of a fake language code "tl".

  [1] Ica9cd2baac002c406f92331aadd7725d7424046a

Bug: 20696126
Change-Id: Ifc8bf2ff6bd617a215e4b68f6b2bf9b94e80db07
2015-12-03 15:21:15 -08:00
Robert Carr
31e2848cc0 Fix repositionChild positioning.
Two seperate issues corrected. First top and left
were swapped as parameters to repositionChild. Second
the recent change to update attributes was incomplete.
Updating the attributes fixes the size and scaling
but its also necessary to update the frame in order
to trigger an update to mShownPosition. Extract and
use a method applyGravityAndUpdateFrame to do so.

Bug: 25791641
Change-Id: Id0b98d587e8acf163121b28eb377c4cf83ebc58b
2015-12-03 15:19:07 -08:00
Winson Chung
47f98ae56b 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.
2015-12-03 22:57:06 +00:00
Jeff Sharkey
dc7a753e5f Merge "Attempt to unlock users with null token." 2015-12-03 22:36:07 +00:00
Jeff Sharkey
b9fe53705c 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
2015-12-03 15:34:27 -07:00
Winson
aaf33bc2b2 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
2015-12-03 14:27:58 -08:00
Winson
a78a8f31d2 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
2015-12-03 14:27:35 -08:00
Winson
40149bfe8c Fixing jump when second finger touches the stack.
Change-Id: I91536ce49d04bc13cbd54f230139592d1d3a3cf1
2015-12-03 14:26:02 -08:00
Winson Chung
1c8a1d7bec Merge "Adding workaround to prevent flicker in Recents when resizing." 2015-12-03 22:23:47 +00:00
Vineeta Srivastava
9bbb90383e Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev am: 9eacc97d71
am: 360930372f

* commit '360930372fcab1a093bd1cd7d11bd082255577d8':
  Set Tether APN protocol type to IPv4 for Telus
2015-12-03 22:09:58 +00:00
Winson
b495300183 Adding workaround to prevent flicker in Recents when resizing.
Change-Id: Id5b12e1208f2a624b386c2388081565205aeca54
2015-12-03 14:03:07 -08:00
Vineeta Srivastava
360930372f Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev
am: 9eacc97d71

* commit '9eacc97d71166a05ec0eb67025a00cb4e57979c8':
  Set Tether APN protocol type to IPv4 for Telus
2015-12-03 22:01:30 +00:00
Vineeta Srivastava
9eacc97d71 Merge "Set Tether APN protocol type to IPv4 for Telus" into mnc-dr1.5-dev 2015-12-03 21:56:29 +00:00
Hyejin Kim
47268e974e Set Tether APN protocol type to IPv4 for Telus
BUG=25356170
Change-Id: I080c354409d263388844543bf7a57ff6c28d760f
2015-12-03 13:35:06 -08:00
Alex Klyubin
dd4e412172 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.
2015-12-03 21:33:44 +00:00
Keun-young Park
b88dd9412e Merge "allow locking UI mode and block launching car dock for automotive" 2015-12-03 21:31:23 +00:00
Alan Viverette
9643e73951 Merge "Ensure only one context menu is shown at a time" 2015-12-03 21:27:07 +00:00
Alex Klyubin
64868d11dd 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.
2015-12-03 21:26:05 +00:00
Alex Klyubin
b1e7f6d287 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.
2015-12-03 21:18:38 +00:00
Alex Klyubin
59c9bfd41b Merge "Stop using 512 bit RSA keys in keyset unit tests." 2015-12-03 21:10:46 +00:00
keunyoung
a771049b2e 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
2015-12-03 13:05:35 -08:00
Jeff Sharkey
8b4fce4bac Merge "Flesh out user locked/unlocked lifecycle." 2015-12-03 21:05:17 +00:00
Christine Hallstrom
07c289d183 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()
2015-12-03 21:00:30 +00:00
Jeff Sharkey
bedbaa9ea6 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
2015-12-03 13:55:09 -07:00
Christine Hallstrom
c1a79e7bd2 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()
2015-12-03 20:52:44 +00:00
Alex Klyubin
377e70ae9f 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
2015-12-03 12:52:23 -08:00
Christine Hallstrom
9355a0420e 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()
2015-12-03 20:42:35 +00:00
Christine Hallstrom
67d068b5ec Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev
am: 7fb263c472

* commit '7fb263c472c9df98410b2b9dfe72e093e2d594e0':
  Log API calls to createBond(), cancelBondProcess(), removeBond()
2015-12-03 20:35:39 +00:00
Christine Hallstrom
7fb263c472 Merge "Log API calls to createBond(), cancelBondProcess(), removeBond()" into cw-e-dev 2015-12-03 20:32:05 +00:00
Winson Chung
95bdfae278 Merge "Temporary workaround for b/25980198" 2015-12-03 20:11:52 +00:00
Andy Hung
dd4ce0640b 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
2015-12-03 20:02:01 +00:00
Yohei Yukawa
0a07982778 Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base 2015-12-03 20:01:03 +00:00
Yohei Yukawa
0eae0eb5a6 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".
2015-12-03 20:00:30 +00:00
Winson
0c1a9b8959 Fixing typo in history check.
Change-Id: Icad0d8f18951dd09c4acb7b4dfb09c019368c0a5
2015-12-03 19:59:45 +00:00
Winson
0e0d85c23c 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
2015-12-03 19:59:29 +00:00
Andy Hung
b0545b6b1e 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
2015-12-03 19:55:32 +00:00
Andy Hung
ae4b789619 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
2015-12-03 19:50:25 +00:00
Andy Hung
a30685ef8d 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
2015-12-03 19:42:45 +00:00
Andy Hung
94cefd6adb 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
2015-12-03 19:34:01 +00:00
Felipe Leme
1684f521d8 Merge "Improved helper used to choose an activity." 2015-12-03 19:30:29 +00:00
Christopher Wiley
fdadaa25eb 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
2015-12-03 19:28:38 +00:00
Andy Hung
7c798c13a7 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
2015-12-03 19:24:02 +00:00
Chris Wren
cf7021e827 Merge "Notification Assistant API" 2015-12-03 19:23:33 +00:00