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

5155 Commits

Author SHA1 Message Date
Wink Saville
7f6fc12997 Merge "Add CellInfoWcdma and related classes." into jb-mr2-dev 2013-04-18 17:06:46 +00:00
Jeff Tinker
d32885bb7f am 4efe71ae: am 45d59a99: Merge "Make MediaDrm APIs public" into jb-mr2-dev 
* commit '4efe71ae55db09a4e3d727175df97d5bcda0449c':
  Make MediaDrm APIs public
 2013-04-18 09:15:45 -07:00
Jeff Tinker
45d59a997f Merge "Make MediaDrm APIs public" into jb-mr2-dev 2013-04-18 16:08:37 +00:00
Jaikumar Ganesh
032aeafd68 am d5af1724: am 176c245c: Merge "Hardware geofence API changes." into jb-mr2-dev 
* commit 'd5af1724500f42e389cc2b8a0be9bacdf53405ad':
  Hardware geofence API changes.
 2013-04-17 22:25:18 -07:00
Jaikumar Ganesh
176c245cef Merge "Hardware geofence API changes." into jb-mr2-dev 2013-04-18 05:18:41 +00:00
Jaikumar Ganesh
da6508954a Hardware geofence API changes. 
b/8631678

1.GeofenceRequest object created.
2.MonitorState moved to a new callback
3.getTypeAndStatus separated to 2 calls.
4.Binder death implemented
5.geofenceChange callback name changed.
6.Parameters rearranged in some calls.

Change-Id: I8fe9621186aeb49efeb0eef1821a2556afe03cfc
 2013-04-17 22:18:01 -07:00
Matthew Xie
cdd94e3647 Remove BluetoothAdapterCallback. Simplify leScan Api 
App does not need to explicitly register/unregister callback
bug 8599881

Change-Id: I18cfef14d7ddb344722945e657dcb959823b412b
 2013-04-17 20:49:33 -07:00
Wink Saville
e3a9cbc052 Add CellInfoWcdma and related classes. 
Update javadoc's to define invalid values are Integer.MAX_VALUE.

Bug: 8622081
Change-Id: I513a67d4b46b72f03e0c3360abcc0ad5222c1c13
 2013-04-17 16:40:17 -07:00
Jeff Tinker
e1c76bebef Make MediaDrm APIs public 
bug: 8603279

Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
 2013-04-17 15:24:48 -07:00
Adam Cohen
c283277551 am f4865efe: am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 
* commit 'f4865efe603e795bc037f5df468556140165eea2':
  DO NOT MERGE Stripping some new widget API that is yet unused
 2013-04-17 14:23:01 -07:00
Adam Cohen
be8bc8392e Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev 2013-04-17 21:03:43 +00:00
Adam Cohen
33f3aab220 DO NOT MERGE Stripping some new widget API that is yet unused 
Change-Id: I7a7156f30aa9105461908f66426950d13eb01408
 2013-04-17 13:48:45 -07:00
Amith Yamasani
c1ce6e1a79 am ac16c21d: am a0042742: Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 
* commit 'ac16c21d11c1545efb8deafbcb7c120a5e0821a1':
  Modify restrictions bundle per api council recommendations
 2013-04-17 11:34:28 -07:00
Amith Yamasani
a0042742c8 Merge "Modify restrictions bundle per api council recommendations" into jb-mr2-dev 2013-04-17 18:26:49 +00:00
Amith Yamasani
7e99bc02c8 Modify restrictions bundle per api council recommendations 
Use a Bundle for persisting and passing to the application, but use a
list to return data back from an application that's exposing restrictions.

Changed the xml reading/writing code to store the value type in the Bundle
so that it can be reproduced when reading. Earlier we were assuming only
String and String[].

Bug: 8633967

Change-Id: I523d5553728edcf28a1e9d432f490b4956f34215
 2013-04-17 10:44:44 -07:00
Chet Haase
270003d636 am 91fedd82: am 873d3ca4: Merge "Remove Animatable interface" into jb-mr2-dev 
* commit '91fedd820bf51061c384d0dc18ea4d15ed22eeaf':
  Remove Animatable interface
 2013-04-17 06:42:22 -07:00
Chet Haase
873d3ca43d Merge "Remove Animatable interface" into jb-mr2-dev 2013-04-17 13:36:00 +00:00
Chet Haase
e8cee38c6a Remove Animatable interface 
Push the interface methods from the new Animatable interface back
down into Animator, from whence they came.

Issue #8634310 Remove Animatable interface

Change-Id: I79e26001709d791d54fcb02561640fe2e008b1fd
 2013-04-16 17:54:14 -07:00
Jesse Hall
25beec154b am b690c9a2: am c7bdd50c: Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev 
* commit 'b690c9a2210f020341ba68dd947b4e2ff43e007d':
  Unhide android.opengl.GLES30 class and contents
 2013-04-16 15:25:16 -07:00
Jesse Hall
c7bdd50c97 Merge "Unhide android.opengl.GLES30 class and contents" into jb-mr2-dev 2013-04-16 22:17:20 +00:00
Jesse Hall
58d80c53c0 Unhide android.opengl.GLES30 class and contents 
Bug: 8566953
Change-Id: I5273fb3bff642da5ff1eecb5899e8051402b19ca
 2013-04-15 17:38:36 -07:00
Jeff Sharkey
ba1bd9aab2 Merge "Support persistable Uri permission grants." 2013-04-15 20:23:14 +00:00
Jeff Sharkey
328ebf2221 Support persistable Uri permission grants. 
When granting a Uri permission with new PERSIST_GRANT_URI_PERMISSION
flag, persist that grant across device reboots until explicitly
revoked.  Adds new persistedModeFlags dimension to UriPermission,
and moves all flag mutation into UriPermission for clarity.  Adds
flag documentation.  Only inflate HashSet as needed.

Write persisted grants into XML file, saving based on source and
target package name and user handle.  Sanity check grants when
parsing.

Wipe all grants from/to a package when uninstalled, and wipe any
transient grants when a package or user is force stopped.

Persistable grants are always considered "needed."

Change-Id: I3f001571b498fd607456a1257a6383f904d19497
 2013-04-15 12:34:40 -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
Jean-Michel Trivi
74e56f1929 Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev 2013-04-15 17:13:46 +00: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
7e157f321c Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev 2013-04-15 15:48:25 +00: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
2de0771da2 Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from" into jb-mr2-dev 2013-04-15 15:16:27 +00: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
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
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
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
e188c984dd Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev 2013-04-13 22:54:01 +00:00
Svetoslav
14210466bf resolved conflicts for merge of dd03b6dc to master 
Change-Id: Ie6628e26d8a033bdce54f9d20156b0358a0956c3
 2013-04-12 18:03:50 -07:00
Amith Yamasani
ccbe389b4d Introducing manifest flag requiredAccountType 
This can be used by apps that won't work without an account of that
type in the limited user environment. This way we can avoid letting
users select these apps when setting up a limited user.

Bug: 8600261
Change-Id: Iaa0dd5ff88e89fa7a1d8a4e70317290268411bdb
 2013-04-12 17:52:42 -07:00
Svetoslav Ganov
26257a09a5 Merge "Allow for setting test type as a monkey." into jb-mr2-dev 2013-04-13 00:15:40 +00:00
Kenny Root
520c1036cb am 019895e2: am 8692685a: Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* commit '019895e2e4744f9ddd76f5df6d59a74dbc5bcd42':
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-12 17:13:39 -07:00
Kenny Root
8692685a54 Merge changes Ia802afe9,If9af0d99 into jb-mr2-dev 
* changes:
  AndroidKeyStore: Add encrypted flag
  keystore: Add flag for blobs to be unencrypted
 2013-04-13 00:04:17 +00:00
Amith Yamasani
8c176b2513 am b0511d47: am e107aa43: Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 
* commit 'b0511d47eb15f4f7941d278467964f2cd6dd2871':
  Rename isUserRestricted to isUserLimited
 2013-04-12 15:39:15 -07:00
Amith Yamasani
e107aa4386 Merge "Rename isUserRestricted to isUserLimited" into jb-mr2-dev 2013-04-12 22:33:05 +00:00
Chet Haase
1d9648df51 am d04215c4: am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 
* commit 'd04215c440e7b7f4bbfe8aaa9a47ccdf3a8dacf5':
  API and doc cleanup, plus small animation/UI features
 2013-04-12 15:26:55 -07:00
Kenny Root
2eeda7286f AndroidKeyStore: Add encrypted flag 
Add the encrypted flag for the KeyPairGenerator and the KeyStore so that
applications can choose to allow entries when there is no lockscreen.

Bug: 8122243
Change-Id: Ia802afe965f2377ad3f282dab8c512388c705850
 2013-04-12 15:19:48 -07:00
Chet Haase
0a41431d69 Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev 2013-04-12 22:18:24 +00:00
Amith Yamasani
46bc4ebb87 Rename isUserRestricted to isUserLimited 
Avoid confusion with user restrictions which can be applied to
non-limited users as well.

Updated the java docs.

Change-Id: I4097c50b528b01a49cebcb0832d09f2b06998faa
 2013-04-12 15:13:53 -07:00
Kristian Monsen
6c3ec1cf99 am 82b6de03: am 03499a23: Merge "Fix for bug 8589670: Marking a not called WebChromeClient as deprecated." into jb-mr2-dev 
* commit '82b6de03cf2d3a66881cc3664dfdcf80c885c226':
  Fix for bug 8589670: Marking a not called WebChromeClient as deprecated.
 2013-04-12 14:14:30 -07:00