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

138937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Connors
ac383e52a9 DO NOT MERGE : Api review: Make ACTION_MANAGED_PROFILE_REMOVED registered only. 
And update the javadoc to explain use-case.

Bug: 15025562
Change-Id: I8eb2666c8480f873e042687223b1a1f82e7919c9
 2014-06-10 10:24:14 +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
Selim Cinek
b89de4ec49 Added card elevation when card is clicked on the lockscreen 
Bug: 15381356
Bug: 15181880
Change-Id: I2dd08b80d2c6b7710d2772c8880b32ab23ec42f9
 2014-06-10 10:47:05 +02:00
Lorenzo Colitti
beacf8d64c Don't enable Ethernet on the emulator. 
Don't start the Ethernet service on the emulator because it
interferes with qemu's SLIRP emulation, which uses IPv4 over
eth0.

Bug: 15341003
Change-Id: I4041a17b19a4861cae4fbf47ab5e05b007385e19
 2014-06-10 14:53:22 +09:00
Chris Craik
9a9d1d5ad2 Merge "Tessellate on worker threads" into lmp-preview-dev 2014-06-10 04:52:12 +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
Igor Murashkin
3721cbaf01 Merge "camera2: Fix session-related CTS test failures" into lmp-preview-dev 2014-06-10 04:02:28 +00:00
Matthew Williams
2368014073 Remove SyncRequest.setPriority from public API 
Bug: 15517262
Change-Id: If62b6f3bf339011dd504889aa24c71a22cb08ed8
 2014-06-09 20:18:25 -07:00
Robert Ly
748856f2d9 am a7ddd029: am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit 'a7ddd0292420c2e8869e093d8bdad5cdc1f199cc':
  Add documentation for AndroidKeyStore
 2014-06-10 02:49:18 +00:00
Robert Ly
a7ddd02924 am 80e84e2d: am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '80e84e2db92ba190c6c517dd4c71cd12c0adb249':
  Add documentation for AndroidKeyStore
 2014-06-10 02:44:08 +00:00
Robert Ly
80e84e2db9 am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit 'f3cecfa2185ef5622992b21da8204b8b6590ef2d':
  Add documentation for AndroidKeyStore
 2014-06-10 02:39:28 +00:00
Robert Ly
f3cecfa218 am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '55d525b26b716351625798675afe69c6cf43cf5a':
  Add documentation for AndroidKeyStore
 2014-06-10 02:36:10 +00:00
Robert Ly
55d525b26b am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '716cc7dcac1bb9279326ab92a78a246b3a70de4e':
  Add documentation for AndroidKeyStore
 2014-06-10 02:32:29 +00:00
Adam Lesinski
cbb0213d81 DO NOT MERGE - Creating an empty package should be succesfull 
Bug: 15473436
Change-Id: I788deb21a1298281c508429bab635aa713803984
(cherry picked from commit 807efa884ba01e0213667000a21908bfb04e8624)
 2014-06-10 01:56:03 +00:00
Chris Craik
05f3d6e511 Tessellate on worker threads 
Tessellate and cache (where possible) shadow and round rect
tessellation tasks.

Change-Id: I2cfda8e11d83d51ea74af871235cf26e8f831d40
 2014-06-10 01:53:17 +00:00
Jeff Brown
8c90ff3b8a Merge "Delete stale commented out declarations." 2014-06-10 01:43:44 +00:00
Jeff Brown
465c5de4ee @hide ACCESS_INPUT_FLINGER permission. 
Bug: 15516225
Change-Id: Ief70650d956a7161153e283c24f553fcfa7996b1
 2014-06-10 01:43:14 +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
df8e542a8a Merge "Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK" into lmp-preview-dev 2014-06-10 01:29:43 +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
Craig Mautner
f357c0ca51 Redefine FLAG_ACTIVITY_NEW_DOCUMENT without NEW_TASK 
Change definition of FLAG_ACTIVITY_NEW_DOCUMENT from
FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET to
FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET alone.

Also add new documentLaunchMode of "never" to allow activity
writers to keep their activity from being launched in document mode.

Fixes bug 15468528.

Change-Id: Ied11adf97e85c5d3f99f4c0bbbb4a2905dcfb24e
 2014-06-09 18:09:33 -07: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
Justin Koh
42c53fd646 Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev 2014-06-10 01:05:05 +00:00
Christopher Tate
d478a3a0d8 Merge "Switch framework to using new scheduled-work API" into lmp-preview-dev 2014-06-10 01:03:52 +00:00
Fabrice Di Meglio
5eba4c5697 Merge "Fix bug #14258811 Permissions icons are not visible in App info" into lmp-preview-dev 2014-06-10 01:00:45 +00:00
Aaron Whyte
83955cb260 Catch OperationUnsupportedException when linkifying using WebView 
This fixes a CTS test for Wearable. We cannot check for FEATURE_WEBVIEW, because
there's no way to get a PackageManager from within these static methods.
Bug: 15131296

Change-Id: I7bf7564b6209f330a413ed54a94be1e07fedb30d
 2014-06-09 17:59:03 -07:00
Fabrice Di Meglio
1e70acb9fc Fix bug #14258811 Permissions icons are not visible in App info 
- add updated assets for Material Theme

Change-Id: Iaa1e5787e5245fa5cffe5a07eb612b62ce9573f7
 2014-06-09 17:58:02 -07:00
Mike J. Chen
a565754a81 Merge "Update default android boot animation png files" 2014-06-10 00:55:07 +00:00
Igor Murashkin
e1442204c1 camera2: Fix session-related CTS test failures 
Bug: 15474402
Change-Id: I4ae86166b5ce99a854c754c8ac6d6c23c683b14a
 2014-06-09 17:51:24 -07:00
Justin Koh
b7c39cee9e Remove WebIconDatabase calls from android.provider.Browser 
This class has been deprecated, so no need to call it.

Bug: 15088030
Change-Id: I6092a9d5f7a12cc14def0996efff7cb689935acb
 2014-06-09 17:50:34 -07:00
Christopher Tate
115afdadb5 Switch framework to using new scheduled-work API 
Also add the intended permission-use enforcement to said API.

Bug 14994893
Bug 14993295

Change-Id: I5a3ffd32d0702c68f4ef6da68f7fa6e9de674380
 2014-06-09 17:49:50 -07: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