146622 Commits

Author SHA1 Message Date
Wink Saville
5f7da67781 am 3a9bab72: Change TelephonyRegistry to use phoneId as a callback condition.
* commit '3a9bab72d04f4b87d12ea1cb22c46d4adf2cb6bf':
  Change TelephonyRegistry to use phoneId as a callback condition.
2014-07-27 02:04:06 +00:00
Wink Saville
e380b98667 Change TelephonyRegistry to use phoneId as a callback condition.
Previously subId was used but it is currently not consistent and
can take on dummy values thus callbacks would not be called appropriately.
Eventually I hope to remove the dummy value concept but for now this
looks like the best approach.

Bug: 16148026
Bug: 15973975
Change-Id: I450c968bda93767554b5188ee63e10c9f43c5aa4
2014-07-26 18:24:22 -07:00
Wink Saville
22a2419c7c am cb2871b3: Fix hasService and use it in updateTelephonySignalStrength.
* commit 'cb2871b3d215dba73042c8730e69c5ad873ff755':
  Fix hasService and use it in updateTelephonySignalStrength.
2014-07-27 00:50:19 +00:00
Wink Saville
d32e1b42c4 Fix hasService and use it in updateTelephonySignalStrength.
I introduced the bug in hasService in
change Ia463997eac7b062653b3cef00570d3fffc115ad3 which added
debug and a quick and dirty hack for 16148026.

Change-Id: I9d5fa36a8cdab2ca28487a94a9f2ecd0d0af6a4b
2014-07-27 00:46:59 +00:00
Jeff Brown
981838a45d am 108f9dc2: Merge "Remove DozeHardware since it will not be used." into lmp-dev
* commit '108f9dc260c703544054c44aa32048ff8556a7e0':
  Remove DozeHardware since it will not be used.
2014-07-26 22:48:23 +00:00
John Spurlock
b4f457d4ed am c9dfaff7: Merge "Doze: Update tease signal to buzz-beep-blink from NoMan." into lmp-dev
* commit 'c9dfaff71e485b67f181a3fcec0fed4df964a92f':
  Doze: Update tease signal to buzz-beep-blink from NoMan.
2014-07-26 21:20:26 +00:00
Jorim Jaggi
00c9cb0930 am 07d1e212: Use finger velocity for ExpandHelper
* commit '07d1e2123eda201b1baf2c34b5fc4d270f0c706e':
  Use finger velocity for ExpandHelper
2014-07-26 17:21:48 +00:00
Jorim Jaggi
28c0b714ac Use finger velocity for ExpandHelper
Makes sure that the animation continuing the expand has the exact
same velocity as the finger started the expand. At the end of the
animation, the velocity slows nicely down (reusing logic from
FlingAnimationUtils, yay!).

Change-Id: If9a286a1a3d1bde649cf0475367a63a2188ca3c0
2014-07-26 17:16:39 +00:00
Jeff Brown
61bf88f676 am 8944771f: Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev
* commit '8944771f51cd39867594a26b31d1ade5c5117e75':
  Fix a deadlock due to AMS calling into WMS with its lock held.
2014-07-26 02:36:39 +00:00
Lajos Molnar
16efefce5c am 88a08631: Merge "Implement MediaCodec.getImage methods" into lmp-dev
* commit '88a08631614beb652f48e2d24a778c4232f5719a':
  Implement MediaCodec.getImage methods
2014-07-26 02:36:35 +00:00
Jeff Brown
c87382a860 am dab2b29b: Merge "Don\'t suppress haptic feedback on keyguard anymore." into lmp-dev
* commit 'dab2b29b35d1b520dc7a45196d1eec2cf71f4d41':
  Don't suppress haptic feedback on keyguard anymore.
2014-07-26 02:36:31 +00:00
Ji-Hwan Lee
49a5cb2e1e am 9c5d5ad9: TIF: Fix invalid use of serviceStateMap.get()
* commit '9c5d5ad9ce29668cc867545a203a146930788009':
  TIF: Fix invalid use of serviceStateMap.get()
2014-07-26 01:59:26 +00:00
Ji-Hwan Lee
c88f1916b8 TIF: Fix invalid use of serviceStateMap.get()
Change-Id: Ic43ac2697ed459a105e62c81e8cb6d0fb8ff6dd0
2014-07-26 01:56:34 +00:00
Jeff Brown
f0f0f7ca66 Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev 2014-07-26 01:02:19 +00:00
Jeff Brown
4b4971b8a3 Fix a deadlock due to AMS calling into WMS with its lock held.
The full deadlock cycle involved ActivityManagerService,
WindowManagerService, and DevicePolicyManagerService.

Fixed by posting the work of enabling the screen to the handler
instead of doing it immediately while holding the activity manager
lock.

Bug: 16578860
Change-Id: I10514cd2df993c7193747ae823e1990a2c34e196
2014-07-25 19:31:47 -07:00
Jeff Brown
82379ba8dd Don't suppress haptic feedback on keyguard anymore.
This enables haptic feedback from virtual keys, lift-to-wake,
and long-press power to work as expected on the keyguard.

There doesn't seem to be a good reason for us to block haptic feedback
on keyguard anymore.  The PIN, pattern, and password locks already
bypass this check and vibrate and require a swipe to access in
the first place.  So there doesn't seem to be much potential
for accidental vibration anymore.

If this becomes a problem then we can investigate more targeted
means to suppress undesired vibration.

Added some debugging code to VibratorService.

Bug: 16535403
Change-Id: Ia7a5d8c35244009db36c358e5cbcbf8cf5d68768
2014-07-25 19:30:00 -07:00
Amith Yamasani
b9cc0d59ec am 0a4e461e: Hidden global setting to allow adding users from lockscreen
* commit '0a4e461eaa30a10dabb44d4eb1c8b48bbce6226c':
  Hidden global setting to allow adding users from lockscreen
2014-07-26 01:02:08 +00:00
Alan Viverette
5a8b4719be am 77b2010c: Merge "Add public attribute for window clipToOutline" into lmp-dev
* commit '77b2010c1f391f0ab3432da50154053b16a905c4':
  Add public attribute for window clipToOutline
2014-07-26 01:02:04 +00:00
Zhijun He
ce8e748c9a am b52d22ce: Merge "CamcorderProfiles: add high speed profile constants" into lmp-dev
* commit 'b52d22ce57b6b99fe0d98424d80adf43610dba2a':
  CamcorderProfiles: add high speed profile constants
2014-07-26 01:01:56 +00:00
Amith Yamasani
23a0f0512a Hidden global setting to allow adding users from lockscreen
This will be undefined/off by default. User has to explicitly
turn it on in the Settings->Users->menu.

Bug: 15760168
Change-Id: I204f28cee2b04832c42e8ec5ced960f6916bfe5a
2014-07-26 00:58:38 +00:00
Fabrice Di Meglio
180d97f038 am 9ace30d1: Fix permission icons size to 24dp
* commit '9ace30d120b91db286a1c2319fe4ef212e2fbbf2':
  Fix permission icons size to 24dp
2014-07-26 00:42:33 +00:00
Fabrice Di Meglio
5c8b789892 Fix permission icons size to 24dp
See bug: #14258811 Permissions icons are not visible in App info

Change-Id: Ib77bae60d4a14163c72fdeb4cb084ddbd739f69b
2014-07-26 00:38:35 +00:00
Sandeep Siddhartha
6be9283e74 am 5940eb3a: Fix various bugs with model management
* commit '5940eb3a7cb88fb47c962326a7d3d80d01b810bd':
  Fix various bugs with model management
2014-07-26 00:22:27 +00:00
Sandeep Siddhartha
7c038097b5 am be52f0d1: Add read/writeBlob to Parcel
* commit 'be52f0d1d99fe34f912e089b27c4d0730d93356e':
  Add read/writeBlob to Parcel
2014-07-26 00:12:41 +00:00
Sandeep Siddhartha
452a642430 Fix various bugs with model management
- Tie the sound model and keyphrase for simplicity
  We won't support multiple keyphrases in a single model out of the box.
  The db schema will need to be changed by the OEM wishing to add multiple hotwords.
  This is because we currently have no way to test the flow and make sure that things work well with multiple keyphrases
  and also the framework only reads the metadata for one keyphrase.

- Make the delete/update operations atomic

- Make the flow of data from Enrollment -> VIMS; the large sound model doesn't cross the process boundary any other time.
  This is achieved by passing they key around, instead of the model themselves.

- Add a specific delete operation in DatabaseHelper rather than relying on emptying the keyphrases to delete.

Bug: 16555803
Bug: 16516353
Change-Id: I1e0cce137517502a669e431ca7e9f9f755598328
2014-07-25 17:11:34 -07:00
Sandeep Siddhartha
90d7a3e996 Add read/writeBlob to Parcel
These are {@hide}en for now.

Bug: 16516353
Change-Id: Ie1635617ee8611a78be9068a7ce674e34c30301d
2014-07-25 16:50:41 -07:00
Jay Civelli
9f0246e261 am 714f4cc4: Revert "Add new intent to prompt user for their device credential. DO NOT MERGE"
* commit '714f4cc47db1b8428c74d20271826eea6fb924e0':
  Revert "Add new intent to prompt user for their device credential. DO NOT MERGE"
2014-07-25 23:45:25 +00:00
Jay Civelli
cdd5fe98b6 Revert "Add new intent to prompt user for their device credential. DO NOT MERGE"
Breaks the JavaDoc generation.

This reverts commit c82a11573810ed4d1f40568d19afc27f726829af.

Change-Id: I9e38a0d6ba0935d4967b50023030c99727bfc839
2014-07-25 23:42:07 +00:00
ztenghui
97f3ebf4b4 am ed2a502c: Merge "API REVIEW: VectorDrawable" into lmp-dev
* commit 'ed2a502c3fae8b4faae3a4e83b4b5e111319905f':
  API REVIEW: VectorDrawable
2014-07-25 23:32:59 +00:00
Jorim Jaggi
f2e3029d64 am 6f4d51f1: Add possible string to survive string freeze.
* commit '6f4d51f1a1de790d82c581d659fba636b10820bb':
  Add possible string to survive string freeze.
2014-07-25 23:32:56 +00:00
Jorim Jaggi
ab3d017e11 Add possible string to survive string freeze.
Winter is coming!

Change-Id: I806e8ece14895f9d79127dd7f98b6818d72ecbf1
2014-07-25 23:27:34 +00:00
Ji-Hwan Lee
f35ef4c444 am 5bd81570: TIF: Rename ComponentName variables to "component" consistently
* commit '5bd8157085e1c020b79980cf38da488e0bcaf8f5':
  TIF: Rename ComponentName variables to "component" consistently
2014-07-25 23:24:55 +00:00
Jinsuk Kim
ef0a5607e9 am 20f25011: Merge "MHL controller for subcommand reception" into lmp-dev
* commit '20f2501138d1b86ebdbceef7c7368ee5abdee240':
  MHL controller for subcommand reception
2014-07-25 23:20:52 +00:00
Dake Gu
0d8b33282c am 5a5ae1f2: fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator
* commit '5a5ae1f202fa87ae4f32e1fc9021988efb18be7b':
  fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator
2014-07-25 23:16:50 +00:00
Ji-Hwan Lee
9e8ade2eb7 TIF: Rename ComponentName variables to "component" consistently
Currently, it's sometimes "name", or "service".

Change-Id: I91dffe30fd2b873c744dbde2c027f0582f55746f
2014-07-25 23:16:48 +00:00
Dake Gu
f03c139018 fix ArrayIndexOutOfBoundException of ExitTransitionCoordinator
b/16575308

Change-Id: Ieb4f15a8ead7da9682c97d4d342cd77e0b85e5f8
2014-07-25 23:10:51 +00:00
Michael Wright
bc537dbc17 am 5239ebe3: Add missing documentation for createVirtualDisplay
* commit '5239ebe357401da5380489db1eeb7720ddb32091':
  Add missing documentation for createVirtualDisplay
2014-07-25 23:05:25 +00:00
Ruben Brunk
8c80c834f6 am b4b65247: camera2: Update preview counter after request completed.
* commit 'b4b652474daf1f845ef313c9ff7c5216f1f90ba1':
  camera2: Update preview counter after request completed.
2014-07-25 23:05:21 +00:00
Winson Chung
717d0bdcf0 am bee771f7: Fixing issue with Recents not triggering correctly for secondary users. (Bug 15689540)
* commit 'bee771f7316b19c79e03c6a06287d9d03c3d2af6':
  Fixing issue with Recents not triggering correctly for secondary users. (Bug 15689540)
2014-07-25 23:05:17 +00:00
Evan Charlton
7f855cba4a am 2f22a0eb: Merge "Make creating the Connection synchronous" into lmp-dev
* commit '2f22a0eb06fe677eceb05c6bc650b94bdb1e00ef':
  Make creating the Connection synchronous
2014-07-25 23:05:13 +00:00
Sreeram Ramachandran
7dd3a4a6fa am a6754382: Merge "Implement support for bypassable VPNs." into lmp-dev
* commit 'a6754382ce829fdeb3542678a314a2e19fd5621b':
  Implement support for bypassable VPNs.
2014-07-25 23:05:10 +00:00
Fabrice Di Meglio
16b7e2e804 am 09370607: Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
* commit '0937060722512fcc0b46852afaeffaa755b2f5ce':
  Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
2014-07-25 23:05:06 +00:00
Michael Wright
5438e4e173 Add missing documentation for createVirtualDisplay
Fix incorrect access modifier in Activity documentation.

Change-Id: Id41da6ccbdfa8b53c89360c899f3a43aec899982
2014-07-25 23:01:32 +00:00
Jason Monk
9a090e6ded Merge "Fix incorrect Activity#startLockTask doc" into lmp-dev 2014-07-25 23:00:08 +00:00
Jason Monk
8863b57e89 Fix incorrect Activity#startLockTask doc
It referenced a swipe down gesture that doesn't exist.  This should
be more safe, and cover other devices as well.

Bug: 16626273
Change-Id: I907b25a00d903f9f36ca335d3a75c1f8f931d50e
2014-07-29 13:49:32 -04:00
Ruben Brunk
971251f362 camera2: Update preview counter after request completed.
Bug: 15116722

- This was causing the preview counter to double decrement
  for requests where the jpeg callback was executed first.

Change-Id: I6bfdaa7da7f68e86e05dc7ac60ceb3c8d5a0104a
2014-07-25 22:53:32 +00:00
Winson Chung
c37e129539 Fixing issue with Recents not triggering correctly for secondary users. (Bug 15689540) 2014-07-25 22:47:33 +00:00
Adam Lesinski
d7a94da476 Have AEP GL feature depend on GLES 3.1 in badging
AAPT dump badging should output the uses-gl-es tag with
a version of 3.1 when android.hardware.opengles.aep is
declared as a feature.

Change-Id: I8affc6dad574c8303c6ba9810ad8e6e205ea9506
2014-07-25 22:45:33 +00:00
Fabrice Di Meglio
75b121553f Fix bug #16245852 Clean SimpleMonthView.setMonthParams() in the new DatePicker
- simply create a method for passing those parameters
- remove non needed constants

Change-Id: If6e7d21ff07370edd8c73d1e9b5c5f820f3deb5d
2014-07-25 22:36:22 +00:00
John Reck
2c70ade77d am 5253d8df: Merge "Shut up" into lmp-dev
* commit '5253d8df85b5d70128403ffc7aa154d0e3c9fe74':
  Shut up
2014-07-25 22:27:58 +00:00