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

138656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
56f7c59168 Merge "Import translations. DO NOT MERGE" 2014-06-10 15:28:25 +00:00
Baligh Uddin
291258c880 Merge "Import translations. DO NOT MERGE" 2014-06-10 15:28:19 +00:00
Matthew Williams
f53c295ae3 am 3b471117: Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev 
* commit '3b4711176e77640d697e94137e65fa93c8363f5c':
  Add OnNetworkActive to TaskManager and simplify locking.
 2014-06-10 14:55:46 +00:00
John Reck
1a2f7a1e29 resolved conflicts for merge of 2d2aa0cc to master 
Change-Id: Ib7bb0e40569a8f6a7f856eef54980d70d9769cdc
 2014-06-10 07:53:03 -07:00
Jeff Sharkey
d734c698e3 am 99f4fe07: Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev 
* commit '99f4fe0797adb8350f92c7d1ba11776d1947e768':
  Refactor directory API to "opening document tree."
 2014-06-10 11:18:54 +00:00
Xiaolei Wang
b71f764c28 am c686a0d4: Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev 
* commit 'c686a0d4b116654d6bec3ff7d5443f8da3ffb20a':
  Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
 2014-06-10 11:18:48 +00:00
Alan Viverette
3b77eb33a5 am 28104981: Merge "Optimize use of layers in ripple, update dialog styling" into lmp-preview-dev 
* commit '28104981ea36e96e0c85b735b91583fb344b85c5':
  Optimize use of layers in ripple, update dialog styling
 2014-06-10 11:18:38 +00:00
Alan Viverette
4a00c53800 am 5d5de3ee: Merge "Use a weak reference to the ObjectAnimator target" into lmp-preview-dev 
* commit '5d5de3ee32302ae45f3a01933997a2b838bf6291':
  Use a weak reference to the ObjectAnimator target
 2014-06-10 11:18:30 +00:00
Jeff Brown
11ef6a3b11 am 16eb7133: (-s ours) Add @SystemApi annotation to internal permissions. (DO NOT MERGE) 
* commit '16eb71335edcbe2978e2b2a9e5a69d1458ab03bd':
  Add @SystemApi annotation to internal permissions. (DO NOT MERGE)
 2014-06-10 11:18:19 +00:00
Jeff Brown
260fd18d4d am 1337bac1: (-s ours) Add support for @SystemApi annotation to aapt. (DO NOT MERGE) 
* commit '1337bac111c70ba4ccce21b2c75491ee690954a8':
  Add support for @SystemApi annotation to aapt. (DO NOT MERGE)
 2014-06-10 11:18:14 +00:00
Jeff Brown
1ffcc58c68 am 7296e808: (-s ours) Rename PrivateApi annotation to SystemApi. (DO NOT MERGE) 
* commit '7296e80837cd8e406e04193c239a1441c9f147b0':
  Rename PrivateApi annotation to SystemApi. (DO NOT MERGE)
 2014-06-10 11:18:09 +00:00
Michael Wright
66a862c38e am b225171e: (-s ours) Merge "Pack PointerCoords with BitSet. DO NOT MERGE" into lmp-preview-dev 
* commit 'b225171eb981dbd062c6c6b42a963930a31a2a51':
  Pack PointerCoords with BitSet. DO NOT MERGE
 2014-06-10 11:18:02 +00:00
Matthew Williams
3f51a909f0 am a06fce7d: Merge "Add test app for JobScheduler" into lmp-preview-dev 
* commit 'a06fce7dea359571877ae8d9cd9cf720934083f5':
  Add test app for JobScheduler
 2014-06-10 11:17:55 +00:00
Yohei Yukawa
2f4bd692d3 Merge "Use more user actions to update the IME rotation order" 2014-06-10 09:33:13 +00:00
Kenny Guy
ef2b37ea87 Merge "Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only." 2014-06-10 08:55:47 +00:00
Jungshik Jang
2ae1019c97 Merge "Implement cec message cache." 2014-06-10 04:40:40 +00:00
Jungshik Jang
e81e108c40 Implement cec message cache. 
HDMI bus for CEC is quite slow and it may cause conflict
or timeout during device discovery stage or hot-plug
detection stage. However, some static information, such
as physical address, vendor id or osd name are usually
sent automatically when a device is connected, and
almost never change after updated.

Change-Id: I4df9d27ef1af04ee35d63a764580fed07c32d15d
 2014-06-10 13:39:19 +09:00
Jeff Brown
8c90ff3b8a Merge "Delete stale commented out declarations." 2014-06-10 01:43:44 +00:00
Justin Koh
0c4122c9b5 am ce8c1086: am eba8782a: Add NPE check to getSystemWindowInsets 
* commit 'ce8c1086fbc42e80056b59d9dbbd6144cb85f20d':
  Add NPE check to getSystemWindowInsets
 2014-06-10 01:30:21 +00:00
Justin Koh
36b0cae955 am 2be4ddc4: am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 
* commit '2be4ddc403b55e3c5107609a2eaeed4ddc0f23f0':
  Fix Browser when running on a platform without webview
 2014-06-10 01:30:16 +00:00
Robert Ly
55762575b0 am a60406f5: am e70609c8: am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs 
* commit 'a60406f5465208079c14770defcfcced10432481':
  remove erroneous file
 2014-06-10 01:30:11 +00:00
Adam Lesinski
3cfe720a0d am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev 
* commit '5fed49f7d614ae9e83db04703484b31c8077b78c':
  Allow for a NoOp implementation of DrmManagerClientImpl
 2014-06-10 01:30:05 +00:00
Craig Mautner
e1ab884a67 Merge "resolved conflicts for merge of 1e6706ab to master" 2014-06-10 01:27:07 +00:00
Amith Yamasani
8108d7f3bf Merge "Make LocationManagerService aware of user profiles" 2014-06-10 01:20:20 +00:00
Amith Yamasani
b27528d066 Make LocationManagerService aware of user profiles 
LocationManagerService normally doesn't provide location to background users.
With managed profiles, there are more than one foreground users and they both
need to get location when in the foreground. So LMS will now compare the caller
against all foreground users and provide location if valid.

Bug: 14671472
Change-Id: If3baabfc5a3ab3f2f081d7fc28f35d840d5f1489
 2014-06-09 18:06:20 -07:00
Mike J. Chen
a565754a81 Merge "Update default android boot animation png files" 2014-06-10 00:55:07 +00:00
Matthew Williams
5553aeb2ae Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev 2014-06-10 00:24:05 +00:00
Matthew Williams
effacfa75b Add OnNetworkActive to TaskManager and simplify locking. 
Bug: 14993295
Hooks up a ConnectivityManager.NetworkActiveListener.
    
Previously was using 3 locks where 1 would suffice,
negligible to no performance issues b/c most of the previous locks
were nested.

Added OnNetworkActiveListener so that the ConnectivityController can kick of
tasks when it knows that the network is active.

Fixed some bugs that stopped timecontroller from executing tasks.

Requesting a retry will not add a deadline to that task. However backed-off
tasks are run as soon as they are ready, subject to their constraints.

Added receiver to listen for package removal and user removal, which will
delete any outstanding jobs for that uid.

Change-Id: I4c4523af558b927f19b8a215878fcc7198abb93f
 2014-06-09 17:18:11 -07:00
Jinsuk Kim
e44e754166 Merge "Tag HdmiControlService API classes with @hide/@SystemApi" into lmp-preview-dev 2014-06-10 00:11:20 +00:00
Adam Lesinski
961dda7796 Creating an empty package should be succesfull 
Bug: 15473436
Change-Id: I788deb21a1298281c508429bab635aa713803984
 2014-06-09 17:10:29 -07:00
Jeff Sharkey
f8f69b899f Merge "Refactor directory API to "opening document tree."" into lmp-preview-dev 2014-06-10 00:10:28 +00:00
Xiaolei Wang
2641ab276c Merge "Add constants to Android TV On Device Search. Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a" into lmp-preview-dev 2014-06-10 00:09:38 +00:00
Jeff Sharkey
b9fbb7290b Refactor directory API to "opening document tree." 
Cleans up API so it consistently refers to opening or working with a
subtree of documents.  Also separates isChildDocument() support from
the concept of directory tree selection.

Bug: 15429194
Change-Id: Ice66a751ff4bd0cc4d34c44c5da13a0dc4186dc9
 2014-06-09 17:07:58 -07:00
Jeff Brown
e2708d98ce Delete stale commented out declarations. 
Most of these methods have now been implememented earlier
in the class.

Change-Id: Id9ef2fa09c64ada788f1b9d95b14836f98498843
 2014-06-09 17:04:06 -07:00
Jinsuk Kim
66d1eb285b Tag HdmiControlService API classes with @hide/@SystemApi 
Bug: 15516329, Bug: 15516710
Change-Id: Ie814513a642660b6c5fdc9e891ad1eec1b2d689b
 2014-06-09 23:49:21 +00:00
Alan Viverette
5efab6c98c Merge "Optimize use of layers in ripple, update dialog styling" into lmp-preview-dev 2014-06-09 23:32:35 +00:00
Alan Viverette
fc9f55ae12 Merge "Use a weak reference to the ObjectAnimator target" into lmp-preview-dev 2014-06-09 22:58:13 +00:00
Mike J. Chen
784184e75d Update default android boot animation png files 
Bug 15143975

Change-Id: I11c9f43aaec4ebff9d291084fc8f997f15c46ddd
Signed-off-by: Mike J. Chen <mjchen@google.com>
 2014-06-09 15:54:00 -07:00
Michael Kolb
7119c07192 resolved conflicts for merge of 1e6706ab to master 
Change-Id: Ia8e8fdf5e13acca496bf7ff9916c9950d5b13e4e
 2014-06-09 15:35:59 -07:00
vandwalle
6123315ad4 Merge "remember and report network score" 2014-06-09 22:30:26 +00:00
Chris Craik
cb9851d4fe Merge "Annotated the drawing commands." 2014-06-09 22:22:11 +00:00
Xiaolei Wang
b2b2ac1287 Add constants to Android TV On Device Search. 
Change-Id: I7b5780f8c4c0367d198607ad2780cf6ec6a96d3a
 2014-06-09 15:07:17 -07:00
vandwalle
2ab9089dfa remember and report network score 
Change-Id: Iccb2ec603bc9c0d3cf1976d0cc3f343cb1096494
 2014-06-09 14:50:47 -07:00
Jeff Brown
238fd930fc Add @SystemApi annotation to internal permissions. (DO NOT MERGE) 
This is a first pass at annotating permissions that should not be
granted or used by to third-party apps but that may be required by
privileged system applications.  For this patch, the annotation was
only added to permissions that have a protection level of at least
system.  Signature-only permissions were left alone since they only
need to be visible to built-in components.

Change-Id: I189472028274c133793ad8e4068585c536dd7f38
 2014-06-09 14:31:41 -07:00
Jeff Brown
709ce0a4c6 Add support for @SystemApi annotation to aapt. (DO NOT MERGE) 
When aapt sees @SystemApi in the XML comment associated with a resource,
it will now remove this tag from the comment (since is it not meaningful as
a Javadoc tag) and instead add an @android.annotation.SystemApi annotation
to the declared type or member.  This enables easy downstream processing of
this annotation from generated code.

Change-Id: If984908477648c0c90be52fdc955fbb891d99b28
 2014-06-09 14:28:42 -07:00
Jeff Brown
5c507c1371 Rename PrivateApi annotation to SystemApi. (DO NOT MERGE) 
Change-Id: I97b473884f81ad375d0733e4766afe091dfdd854
 2014-06-09 14:28:11 -07:00
Justin Koh
ce8c1086fb am eba8782a: Add NPE check to getSystemWindowInsets 
* commit 'eba8782a1f8412a3510fc78a71b843ef6e89bdbb':
  Add NPE check to getSystemWindowInsets
 2014-06-09 21:12:39 +00:00
Justin Koh
2be4ddc403 am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 
* commit 'a5de8479f442b7e6f8d285db58713e42fb922798':
  Fix Browser when running on a platform without webview
 2014-06-09 21:12:35 +00:00
Robert Ly
a60406f546 am e70609c8: am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs 
* commit 'e70609c87e7de59dbe9c01226bd251a705e71305':
  remove erroneous file
 2014-06-09 21:12:31 +00:00
Adam Lesinski
5fed49f7d6 am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev 
* commit '4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b':
  Allow for a NoOp implementation of DrmManagerClientImpl
 2014-06-09 21:12:25 +00:00