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

104850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
3b9dd0a958 am 168e18d4: am d7f67d6f: am 80f8c84e: am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit '168e18d4b8fdb69a2898f538cd8cd251260a373b':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 11:10:35 -07:00
Daniel Sandler
f3e6e184b1 am 492c67a8: am bd573049: Merge "Putting the gesture debugging back in the box." into jb-mr2-dev 
* commit '492c67a8b12ce154e41dc48102ae99e0c0e5210d':
  Putting the gesture debugging back in the box.
 2013-04-15 11:10:32 -07:00
Kenny Root
4622351159 keystore: Add flag for blobs to be unencrypted 
In order to let apps use keystore more productively, make the blob
encryption optional. As more hardware-assisted keystores (i.e., hardware
that has a Keymaster HAL) come around, encrypting blobs start to make
less sense since the thing it's encrypting is usually a token and not
any raw key material.

(cherry picked from commit a3788b00bb221e20abdd42f747d2af419e0a088c)

Bug: 8122243
Change-Id: Ifc1c64743651b23a4eace208ade0176af47ea989
 2013-04-15 11:09:29 -07:00
Scott Main
168e18d4b8 am d7f67d6f: am 80f8c84e: am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit 'd7f67d6f0b59c5aa0251127baa4c55037c902e7f':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 11:06:58 -07:00
Daniel Sandler
492c67a8b1 am bd573049: Merge "Putting the gesture debugging back in the box." into jb-mr2-dev 
* commit 'bd573049ec5a0c0d73b4835a2308c6737dfff2f3':
  Putting the gesture debugging back in the box.
 2013-04-15 11:06:55 -07:00
Scott Main
d7f67d6f0b am 80f8c84e: am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit '80f8c84e0cf9b2703939af6bb4aeff7000e3fd9e':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 11:04:33 -07:00
Kenny Root
5678bacdff Merge "Remove keystore entries when app data cleared" 2013-04-15 18:03:09 +00:00
Daniel Sandler
bd573049ec Merge "Putting the gesture debugging back in the box." into jb-mr2-dev 2013-04-15 18:02:52 +00:00
Scott Main
80f8c84e0c am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit '0451003f681c830fe626e4e0e6861c0bca8de51f':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 11:00:06 -07:00
Kenny Root
e28b084d14 Remove keystore entries when app data cleared 
When an application's user data is cleared, the keystore entries need to
be cleared as well. Previously we were only clearing entries when the
application was uninstalled for all users. Now we cover the case of
multiuser as well.

(cherry picked from commit 6fd1c85d7f909580582e5ebc357564331ecef283)

Bug: 8566369
Change-Id: Id4df5e50661b676b8f6507b915764400982c01a0
 2013-04-15 10:57:24 -07:00
Scott Main
0451003f68 am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit 'c06776912d75190966c5f00e617edffbfe01851c':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 10:56:42 -07:00
Scott Main
c06776912d am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit '92fd5508aae8f8b43164405a5b725d0e60e464e1':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 10:52:40 -07:00
Scott Main
92fd5508aa am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 
* commit 'c70e0f5e182ab209ab9b272c1408ac3170ca6345':
  add oppo and xiaomi driver links bug: 8523141
 2013-04-15 10:49:35 -07:00
The Android Open Source Project
44dc8e1c7a am 2c5dca4a: Reconcile with jb-mr2-release - do not merge 
* commit '2c5dca4a3f227d5e4e103bdbd61f584446bd229f':
  Fix keyguard pattern invalidate bug
  Ensure looper quits after all other messages are handled.
 2013-04-15 10:49:03 -07:00
The Android Open Source Project
2c5dca4a3f Reconcile with jb-mr2-release - do not merge 
Change-Id: I618d51505419200bc282404ec2af470be97f1fa7
 2013-04-15 10:46:07 -07:00
Scott Main
c70e0f5e18 Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs 2013-04-15 17:45:22 +00:00
Kenny Root
caf0496dc2 Merge "Check outInfo is not null" 2013-04-15 17:44:59 +00:00
Kenny Root
fc78e60a83 Check outInfo is not null 
Only call keystore if outInfo is not null

(cherry picked from commit 3b9933d0c2f2b9a2e973dca296ee45a69087e31c)

Bug: 8568820
Change-Id: I764980fd396dbc637732ad290eea2bd11036ec28
 2013-04-15 10:42:14 -07:00
Jean-Michel Trivi
46863c6dea am 42732e10: am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 
* commit '42732e1037b48e9bf71e9965bc28ddb5d8242fa4':
  Public APIs for media position in RemoteControlClient
 2013-04-15 10:22:42 -07:00
Kristian Monsen
98dedf7ccc Fix for bug 8607049: Improve javascript dialogs for classic 
Make a common JsDialogHelper for classic and chromium webview
Improve on before unload dialog

Change-Id: Ib9711e4f95189ef8b2b31fc64aec7c0cb535d0e4
 2013-04-15 10:22:34 -07:00
Jean-Michel Trivi
42732e1037 am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 
* commit '74e56f19299cd04e2e6c6a9a19af260551750d6a':
  Public APIs for media position in RemoteControlClient
 2013-04-15 10:19:24 -07:00
Jean-Michel Trivi
74e56f1929 Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 2013-04-15 17:13:46 +00:00
Baligh Uddin
a1a67eb23d Import translations. DO NOT MERGE 
Change-Id: Ifb0c975361e9e00feb3957139cf2c15a463a5319
Auto-generated-cl: translation import
 2013-04-15 09:19:05 -07:00
Baligh Uddin
18148ab9bc Import translations. DO NOT MERGE 
Change-Id: Id459e72b14f63a9c4428c6ca67e600d9a0b6ec3f
Auto-generated-cl: translation import
 2013-04-15 09:08:04 -07:00
Baligh Uddin
87d19d04ea Import translations. DO NOT MERGE 
Change-Id: Ifcb746e1bec6ba3252d57feef425738ef84636e6
Auto-generated-cl: translation import
 2013-04-15 08:59:28 -07:00
Ben Murdoch
5d4d155eaf am e41c3cdb: am 7e157f32: Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev 
* commit 'e41c3cdb9c4b56cb1dc48242d7910df9a16bf8b7':
  Deprectate WebViewDatabase password methods.
 2013-04-15 08:56:42 -07:00
Ben Murdoch
e41c3cdb9c am 7e157f32: Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev 
* commit '7e157f321c690e41f0f18a556f989fd20709469f':
  Deprectate WebViewDatabase password methods.
 2013-04-15 08:52:46 -07:00
Ben Murdoch
7e157f321c Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev 2013-04-15 15:48:25 +00:00
Brian Colonna
a5239891dc Enabling Face Unlock for user switching (bug 8495282) 
We had been intentionally disabling FUL when switching to a new user.
The reason was that we were only getting a signal when the user switch
started, not when it completed.  If we started FUL at the beginning of
the user switch, it could be completed by the time the user switch
completed.  We now have a signal to tell us that the switch completed.

Prior to this change, FUL would start whenever keyguard is created.
For a user switch, keyguard is recreated when we get
onUserSwitching(), but we don't want FUL to start until we get
onUserSwitchComplete().  So with this change, if onResume() happens
because of a user switch it doesn't start FUL until we get
onUserSwitchComplete().

Change-Id: I1d3da0a32b9b4cf0cfa5c577f1697d2a41ee4fda
 2013-04-15 11:45:40 -04:00
Andreas Huber
9015e018eb am e813a85c: am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev 
* commit 'e813a85c97f542bbfc306a30ce2ae4c305133203':
  MediaExtractor.setDataSource(...) has always thrown IOExceptions from
 2013-04-15 08:38:28 -07:00
Andreas Huber
a7407ef01e am baf4a057: am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev 
* commit 'baf4a057f8d4b5a97a5b3da276b59c2cd175e4b7':
  Document that MediaPlayer.getDuration() returns an invalid value (-1)
 2013-04-15 08:38:25 -07:00
Andreas Huber
e813a85c97 am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev 
* commit '2de0771da2b6c07f717d62ae4e4be93702af9a43':
  MediaExtractor.setDataSource(...) has always thrown IOExceptions from
 2013-04-15 08:34:37 -07:00
Andreas Huber
baf4a057f8 am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev 
* commit '5c5c3f3abd8a95bf46378fd93b13160ad52e74ff':
  Document that MediaPlayer.getDuration() returns an invalid value (-1)
 2013-04-15 08:34:34 -07:00
Andreas Huber
2de0771da2 Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev 2013-04-15 15:16:27 +00:00
Andreas Huber
5c5c3f3abd Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)" into jb-mr2-dev 2013-04-15 15:15:41 +00:00
The Android Automerger
d39de0b042 merge in jb-mr2-release history after reset to jb-mr2-dev 2013-04-15 05:55:51 -07:00
Jason Sams
f38c6ab76a am c4294ed2: am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev 
* commit 'c4294ed2f1de5c89b5e283942e0d5f8cd8822bfb':
  Unhide new RS APIs.
 2013-04-14 19:28:29 -07:00
Jason Sams
c4294ed2f1 am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev 
* commit '330a9fe323cfb2f492665b73822f056c2c6689c2':
  Unhide new RS APIs.
 2013-04-14 19:25:10 -07:00
Jason Sams
330a9fe323 Merge "Unhide new RS APIs." into jb-mr2-dev 2013-04-15 02:22:14 +00:00
Jean-Michel Trivi
9157477300 Public APIs for media position in RemoteControlClient 
New APIs in android.media.RemoteControlClient to support application
 exposing their current media playback position and speed, and
 let the framework request position changes.

Bug 8120740

Change-Id: Ibfc41f60e279413c26147e3276d96f28b7f506e7
 2013-04-14 12:17:56 -07:00
Jason Sams
9bf189228f Revert GC thread changes 
This is not quite a straight revery, some manual edits were necessary.

The original CL didn't undergo sufficient design review or testing.  Revert until the regressions can be sorted out.

Bug 8585185


This reverts commit 6dacf8355a0692b52c49f603f43317772cb36175

This reverts commit f8c033db1edf36a0ab09568c3142054f0be2d1a1

Change-Id: Ie7215bdf881332e822603547e92f810f595077fc
 2013-04-14 02:56:03 +00:00
Jason Sams
02d56d90e0 Unhide new RS APIs. 
This exposes the fast path handling of YUV data.

bug 8566866

Change-Id: Iaa3700100db61dd51d16d80ea8ae22f2dcc41bb0
 2013-04-14 02:51:57 +00:00
Amith Yamasani
6011355635 am 6064c5cf: am e1375908: Rename isUserLimited to isLinkedUser 
* commit '6064c5cf22b16464a82f04f0a9560f412ba2a90a':
  Rename isUserLimited to isLinkedUser
 2013-04-13 17:25:16 -07:00
Amith Yamasani
6064c5cf22 am e1375908: Rename isUserLimited to isLinkedUser 
* commit 'e1375908a5f05e5c926e95049970c4505e4dfad9':
  Rename isUserLimited to isLinkedUser
 2013-04-13 17:22:09 -07:00
Amith Yamasani
e1375908a5 Rename isUserLimited to isLinkedUser 
A linked user is derived from another user and shares their accounts.

Change-Id: Ia2e63d573ccb635495ec54f31ac7b174725ad7a8
 2013-04-13 16:48:35 -07:00
Amith Yamasani
dc97936e36 Fix attr id update due to api change upstream 
Change-Id: Ief2e90522322ecc6e3832f27d7b00b146dce54fc
 2013-04-13 16:40:00 -07:00
Amith Yamasani
362c4ddff3 am 19c95bcc: am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 
* commit '19c95bcc76cd68e241e3d29a5e49fc892521527d':
  Introducing manifest flag requiredAccountType
 2013-04-13 16:01:59 -07:00
Amith Yamasani
19c95bcc76 am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 
* commit 'e188c984ddd4ae4b109c3f204b03a8f798f7e9e8':
  Introducing manifest flag requiredAccountType
 2013-04-13 15:56:31 -07:00
Amith Yamasani
e188c984dd Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 2013-04-13 22:54:01 +00:00
Xavier Ducrohet
974dc1f4f8 am ade20f49: am a068eedd: Revert "Make --non-constant-id generates non final IDs for styleable." 
* commit 'ade20f49a1a0226c06a6ae5d8074c9c1cc14a152':
  Revert "Make --non-constant-id generates non final IDs for styleable."
 2013-04-13 09:59:07 -07:00