drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153,580 Commits 1 Branch 0 Tags
Commit Graph

153580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
b17ff6777d am 57bb094b: am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '57bb094b818d0e215cd987738078e5c181c26fac':
  Specify a device identifier for keyboard layout notification.
 2014-09-25 22:38:38 +00:00
Eino-Ville Talvala
c2c520950a Merge "Camera2 Legacy: Clear JPEG ids when reconfiguring." into lmp-dev 2014-09-25 22:36:59 +00:00
Michael Wright
e27380ac46 am 233bbabf: Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 
* commit '233bbabfe10bbf7190cdf3a6bb44f081a1fa91c7':
  Specify a device identifier for keyboard layout notification.
 2014-09-25 22:27:05 +00:00
Junda Liu
aa047467a1 Merge "Revert "Hide CarrierPrivilege APIs in TelMgr."" into lmp-mr1-dev 2014-09-25 22:24:34 +00:00
Michael Wright
61a43ee7a9 Turn the device on if the camera lens is uncovered. 
Bug: 17643810
Change-Id: I4747414224c3219bf91c0c83e969530cb20f96e5
 2014-09-25 22:19:13 +00:00
Michael Wright
42dad80418 Merge "Specify a device identifier for keyboard layout notification." into lmp-dev 2014-09-25 22:18:20 +00:00
mike dooley
95ea5765dc Adding support for Cdma conference calling. 
Adding methods to merge and swap Cdma conference
calls from hangouts.

Bug: 17658943
Change-Id: I0ce472415e3455503223fc0dab5e1a8ee415cde9
 2014-09-25 15:09:02 -07:00
RoboErik
1dc5ba8665 Disable MediaSessionLegacyHelper debugging 
Switched over to using Log.isLoggable instead for release.

Change-Id: Iebd6871adb9994e23292953f14b6a997c83957a0
 2014-09-25 14:57:35 -07:00
RoboErik
5535ea8ef8 Remove BT routes when BT is turned off 
A behavior change in the BT stack caused it to stop sending connection
changes for connected devices when you turn BT off. To work around this
we need to remove the connected BT route when BT is turned off.

bug:17512270
Change-Id: I3e5aa8863409c5abac51aa4e93a15f1978cf74b3
 2014-09-25 14:57:35 -07:00
Tsuwei Chen
566ebfde2b Fix an incorrect behavior that failed AT&T privacy test. 
Bug: 17278951

Change-Id: I8b8bf4ed19af8738e7cef3553c8a06f7e27c7264
 2014-09-25 14:53:54 -07:00
Eino-Ville Talvala
efdd0cc832 am 9ceeb831: am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes 
* commit '9ceeb831c412d80b0961bcf38d81c789aba1718b':
  Camera2 legacy: Improve robustness to camera service crashes
 2014-09-25 21:45:33 +00:00
Eino-Ville Talvala
845ea54c51 am 93f0b612: Camera2 legacy: Improve robustness to camera service crashes 
* commit '93f0b612350e217b8434a0199ba4723c2cfe0e72':
  Camera2 legacy: Improve robustness to camera service crashes
 2014-09-25 21:34:40 +00:00
Eino-Ville Talvala
52571b9032 Camera2 Legacy: Clear JPEG ids when reconfiguring. 
Otherwise, stale IDs for old streams will be left around, causing
JPEGs to be sent to the wrong consumers.

Bug: 17659125
Change-Id: I98e1a1d389147631bc80eaeb10d57f74a6256f32
 2014-09-25 14:06:55 -07:00
Eino-Ville Talvala
eecc904f13 Camera2 legacy: Improve robustness to camera service crashes 
When the camera service dies, the getParameters call is often the first
to fail, and on legacy mode, this frequently happens in a background thread.
Catch the runtime exceptions and convert to device errors, instead of killing
the process.

Bug: 17587496

Change-Id: I6757961e7c0387defd368a13cb7c343950602400
 2014-09-25 14:06:55 -07:00
Alan Viverette
f4a8123480 am a9517205: am 21662c96: Merge "Cut ripple background alpha in half" into lmp-dev 
* commit 'a95172054bb02ebd5991e0242e1f7fccbb539ce9':
  Cut ripple background alpha in half
 2014-09-25 20:26:25 +00:00
Alan Viverette
38e85ec432 am c1b3b21e: am 00660f66: Merge "Fix "Always apply window insets to action modes"" into lmp-dev 
* commit 'c1b3b21e92c2c4ded106906abae20a6ac75638ab':
  Fix "Always apply window insets to action modes"
 2014-09-25 20:26:22 +00:00
Svetoslav
fa28252334 am 09b81193: am 85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev 
* commit '09b811936d5e6c16f8be5ce4921c40ec0f298d29':
  Accessibility events may be fired even if no services observe them.
 2014-09-25 20:26:15 +00:00
Alan Viverette
0546ca9258 am 21662c96: Merge "Cut ripple background alpha in half" into lmp-dev 
* commit '21662c96fa9d107a60f4ce98f7179264c972b142':
  Cut ripple background alpha in half
 2014-09-25 20:20:02 +00:00
Alan Viverette
33ae07ab81 Merge "Cut ripple background alpha in half" into lmp-dev 2014-09-25 20:14:34 +00:00
Alan Viverette
68518ddbe2 am 00660f66: Merge "Fix "Always apply window insets to action modes"" into lmp-dev 
* commit '00660f66ef0344698551c88c0f26663f70e31b5e':
  Fix "Always apply window insets to action modes"
 2014-09-25 20:14:29 +00:00
Svetoslav
2d5d5d7947 am 85daf4f0: Merge "Accessibility events may be fired even if no services observe them." into lmp-dev 
* commit '85daf4f04ade8a5d85eab70e63cd184dcb760501':
  Accessibility events may be fired even if no services observe them.
 2014-09-25 20:14:25 +00:00
Chris Wren
b3f87eb694 am cf9ee933: am 2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev 
* commit 'cf9ee9338a7f9972288b5104ee432e8c8cabb46e':
  Allow longer translations in the notification actions.
 2014-09-25 20:12:44 +00:00
Alan Viverette
314dc4c553 Merge "Fix "Always apply window insets to action modes"" into lmp-dev 2014-09-25 20:11:28 +00:00
Svetoslav
57ce30ddfe Merge "Accessibility events may be fired even if no services observe them." into lmp-dev 2014-09-25 20:06:20 +00:00
Alan Viverette
8bdb442703 Cut ripple background alpha in half 
Ripple alpha is supposed to be split evenly between the foreground
ripple layer and the background layer, but the background alpha wasn't
getting adjusted properly.

BUG: 17658817
Change-Id: I7af2f2ed38400a40d4a17da020363c7ae5c71a7b
 2014-09-25 13:06:03 -07:00
Chris Wren
55ea4d3546 am 2eb3b974: Merge "Allow longer translations in the notification actions." into lmp-dev 
* commit '2eb3b974ab5c1f7f1ca79410ea54026f58e35c07':
  Allow longer translations in the notification actions.
 2014-09-25 19:59:06 +00:00
Chris Wren
91807556a8 Merge "Allow longer translations in the notification actions." into lmp-dev 2014-09-25 19:50:33 +00:00
Alan Viverette
947a969560 Correctly advertise accessibility scrolling actions 
Previously, we didn't take into account partially-visible views. This
extracts existing logic for determining whether the list can scroll
up or down and applies that when adding scrolling actions.

BUG: 17648502
Change-Id: I7ed9382e1645970ab098c210ad10f8a077da834b
 2014-09-25 12:43:47 -07:00
Ruben Brunk
b4e87c1128 am 4754428d: am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev 
* commit '4754428da2cc3e1224fc6f227ac831fee90c8b96':
  camera2: Fix null check in PictureCallback.
 2014-09-25 19:40:58 +00:00
Amith Yamasani
bd5ccc1b03 am 158c51f3: am 95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev 
* commit '158c51f3b84f8870d562e12fcd6b1ba672348fd9':
  Fix GPS icon not showing for secondary users
 2014-09-25 19:40:54 +00:00
John Spurlock
bc4f9b2c34 am 37c874d0: am 0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev 
* commit '37c874d0826dfe0142a317b4d7e0e0bf7b53ec17':
  Supertoast when user changes zen mode.
 2014-09-25 19:33:12 +00:00
Ruben Brunk
4b6b2104ac am e76ce25f: Merge "camera2: Fix null check in PictureCallback." into lmp-dev 
* commit 'e76ce25ff342d393ffb79ef7e01b09cae5320a73':
  camera2: Fix null check in PictureCallback.
 2014-09-25 19:29:40 +00:00
Amith Yamasani
5ae520ce7d am 95548b39: Merge "Fix GPS icon not showing for secondary users" into lmp-dev 
* commit '95548b395d681b0ecfef341058f282f624ae3862':
  Fix GPS icon not showing for secondary users
 2014-09-25 19:29:36 +00:00
Ruben Brunk
820a08a555 Merge "camera2: Fix null check in PictureCallback." into lmp-dev 2014-09-25 19:23:00 +00:00
John Spurlock
3df5327b96 am 0dccf597: Merge "Supertoast when user changes zen mode." into lmp-dev 
* commit '0dccf597f10fd0dc755f42514c470d447c820b20':
  Supertoast when user changes zen mode.
 2014-09-25 19:19:45 +00:00
Amith Yamasani
91dcf1f93c Merge "Fix GPS icon not showing for secondary users" into lmp-dev 2014-09-25 19:18:24 +00:00
John Spurlock
cf4ef82007 Merge "Supertoast when user changes zen mode." into lmp-dev 2014-09-25 19:08:40 +00:00
John Spurlock
27c7b9295d Supertoast when user changes zen mode. 
If the user selects a new zen mode, display a quick toast
with the mode icon + text to aid in association.

Also fix a recent regression in the zen subhead alignment.

Bug:16215680
Bug:17641211
Change-Id: I4ead88d81be4d9c26459aed82c47b8c2fb32eafa
 2014-09-25 15:04:32 -04:00
Kenny Guy
5dde6e334d Uninstall for all users should check device admins. 
Uninstall for all users should check whether package
is admin for any user not just user 0.

Bug: 17657954
Change-Id: Ia116248b5889fc02dd46816a132e03c8e62662c9
 2014-09-25 20:04:22 +01:00
Paul Lawrence
994ba63f89 am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev 
* commit '7c4b941336300efc04e8842dc21a24f1c17bf345':
  Fix pause when setting pin/pattern/password
 2014-09-25 18:57:20 +00:00
RoboErik
fdc6b9f437 am 10a7dfea: am 504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev 
* commit '10a7dfeab45c0687d7c866c78403ba6f8e53e624':
  Ensure MediaBrowser state is set to connecting after a reconnect
 2014-09-25 18:57:16 +00:00
RoboErik
1f033d38a9 am dff59b8b: am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev 
* commit 'dff59b8b8c3735590aa84c0b5ee92c17459bd6b5':
  Allow null queues to be set in MediaSession
 2014-09-25 18:57:13 +00:00
Junda Liu
f52ac900ca Revert "Hide CarrierPrivilege APIs in TelMgr." 
This reverts commit b7aa9e4a6338811d4dacc77e6024a0b97a99e5e9.

Change-Id: I212cd4f1b7b45e0523fc47b2a9c2a6b487e9dbb5
 2014-09-25 18:56:11 +00:00
Ruben Brunk
2c3d7c5f68 camera2: Fix null check in PictureCallback. 
Bug: 17636586
Change-Id: Ieddc106e14c97dc78405821e83e346d626127e2c
 2014-09-25 11:48:27 -07:00
Paul Lawrence
809c1be06b am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev 
* commit '56a38862d68c3160ae9b049ca89422cc5834e8e3':
  Fix pause when setting pin/pattern/password
 2014-09-25 18:42:10 +00:00
RoboErik
c5b4d9653a am 504752fb: Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev 
* commit '504752fb3833a90f4a226a2027939cb972cb8a9b':
  Ensure MediaBrowser state is set to connecting after a reconnect
 2014-09-25 18:42:06 +00:00
RoboErik
f4ca7463b2 am 23df1c46: Merge "Allow null queues to be set in MediaSession" into lmp-dev 
* commit '23df1c46b768bb2a1363b6f671b0d0c4879538b7':
  Allow null queues to be set in MediaSession
 2014-09-25 18:42:00 +00:00
Paul Lawrence
99cee61cbc Merge "Fix pause when setting pin/pattern/password" into lmp-dev 2014-09-25 18:33:54 +00:00
RoboErik
f099e7c214 Merge "Ensure MediaBrowser state is set to connecting after a reconnect" into lmp-dev 2014-09-25 18:28:52 +00:00
RoboErik
df26651ff4 Merge "Allow null queues to be set in MediaSession" into lmp-dev 2014-09-25 18:28:21 +00:00