Commit Graph

223165 Commits

Author SHA1 Message Date
Felipe Leme
923afa9fe1 Refactoring: pulled ServiceHandler methods to its parent class.
Now ServiceHandler only have 2 methods:

- handleMessage(): part of its interface.
- poll(): delegates work to parent, but sends a delayed message
  so it keeps polling.

Also changed hardcoded "N/A" to a resource.

BUG: 25794470
Change-Id: I486fff46c1532685bfd6f5903349d14e55059219
2015-12-04 14:05:17 -08:00
Felipe Leme
719aaae3c1 Changed workflow so max progress can be dynamically updated.
BUG: 25794470
Change-Id: I75dfdabf9febf54f2fb714441d48b339f8d3d293
2015-12-04 11:50:58 -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
Jeff Sharkey
23d188873a 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
2015-12-03 19:22:30 +00:00
Jeff Sharkey
dd2e8d6a0e 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':
2015-12-03 19:20:55 +00:00
Jeff Sharkey
3a67ddeea9 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':
2015-12-03 19:19:34 +00:00
Yohei Yukawa
d42df4f68e 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".
2015-12-03 19:18:45 +00:00
Jeff Sharkey
f4a6dc52b1 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
2015-12-03 19:18:15 +00:00
Jeff Sharkey
8fbf16f6c6 Merge "Fix race condition when collecting op callback." am: 98844a97d2 am: 678011854b
am: 28d8b8c988

* commit '28d8b8c9882e501f95ec3076a4f1fffc759ea999':
  Fix race condition when collecting op callback.
2015-12-03 19:16:45 +00:00
Jeff Sharkey
5cbbdf2ca6 Merge "Improved variable naming" am: 4ef9d41066 am: bc57510e9f
am: ec0e46fbc6

* commit 'ec0e46fbc612cb9575ae3e7901664cd34666f438':
  Improved variable naming
2015-12-03 19:15:12 +00:00
George Mount
d78c5d7c70 Merge "Revert "Give transitioning fragment a context prior to retrieving transition"" 2015-12-03 19:11:11 +00:00
Yohei Yukawa
30e321b54a Merge "Fix special handling of a fake language code "tl"."
am: 9fd2af6b32

* commit '9fd2af6b323ef98695701a8bcfdd3ca1c4dd7965':
  Fix special handling of a fake language code "tl".
2015-12-03 19:10:30 +00:00
George Mount
895eaa453e Merge "Revert "Choose the correct Fragment to pull a Transiton from."" 2015-12-03 19:10:08 +00:00
George Mount
214f6749fc Revert "Give transitioning fragment a context prior to retrieving transition"
This reverts commit 2b2d23aa70.

Change-Id: Ib3010b4ba3c3d003d5143d9ea63d331c9c2d304e
2015-12-03 19:09:59 +00:00
Felipe Leme
a413143afc 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
2015-12-03 11:09:53 -08:00
George Mount
c30d875c7f Revert "Choose the correct Fragment to pull a Transiton from."
This reverts commit fbaa14bc35.

Change-Id: Ic6953554a97bf125a69209b1db973d7fc48ab31b
2015-12-03 19:09:17 +00:00
Christine Hallstrom
044b8f3f03 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
2015-12-03 19:08:17 +00:00
Yohei Yukawa
9fd2af6b32 Merge "Fix special handling of a fake language code "tl"." 2015-12-03 19:04:24 +00:00
Chris Tate
c169181747 Merge "Improve docs for Parcelable.describeContents()" 2015-12-03 19:00:47 +00:00
Wale Ogunwale
69970ceb71 Merge "Set proper stack in WM when activity is moved to stack in AM" 2015-12-03 18:51:13 +00:00
Chris Wren
9fa689f8b6 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
2015-12-03 13:45:10 -05:00
George Mount
e1abaa631e Adds a way to exclude test directories from javadoc. am: f6be993407
am: c26d7c378a

* commit 'c26d7c378a58f4f312b8385baf4d318c2df35478':
  Adds a way to exclude test directories from javadoc.
2015-12-03 18:38:48 +00:00