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

640 Commits

Author SHA1 Message Date
Svetoslav
dd137a85d3 resolved conflicts for merge of 6be2f952 to master-lockscreen-dev 
Conflicts:
	core/java/android/view/IWindowManager.aidl
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db
 2014-04-10 12:48:07 -07:00
Svetoslav
6be2f95202 Merge "Adding render stats APIs to UiAutomation (framework)." 2014-04-10 19:32:59 +00:00
Paul Lawrence
17f2fdd018 am 9502f990: Merge "Allow encryption when keyguard is set to pattern or no protection" 
* commit '9502f990899ef576879048ec5147d403158ad89d':
  Allow encryption when keyguard is set to pattern or no protection
 2014-04-10 14:33:29 +00:00
Paul Lawrence
9502f99089 Merge "Allow encryption when keyguard is set to pattern or no protection" 2014-04-10 14:30:53 +00:00
Narayan Kamath
2a6599d335 am f148f36d: am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit 'f148f36d140e995ec8f755e60bbb0b37f33c3da7':
  System services detect and register app CPU ABIs
 2014-04-10 09:47:21 +00:00
Narayan Kamath
954a4666ab am d11f223c: resolved conflicts for merge of 286a247e to master 
* commit 'd11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4':
  Re-implement native library search and copies.
 2014-04-10 09:47:18 +00:00
Narayan Kamath
f148f36d14 am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '9e289d70a8baaed0030413b5991653792e2a816d':
  System services detect and register app CPU ABIs
 2014-04-10 09:45:18 +00:00
Narayan Kamath
d11f223c53 resolved conflicts for merge of 286a247e to master 
Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
 2014-04-10 10:38:31 +01:00
Narayan Kamath
9e289d70a8 am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '1d26a3f1efd0d965e8751e8515608c31789bdbe2':
  System services detect and register app CPU ABIs
 2014-04-10 09:26:59 +00:00
Narayan Kamath
286a247e4c am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies." 
* commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889':
  Re-implement native library search and copies.
 2014-04-10 09:26:44 +00:00
Jeff Brown
6fdb5e6df1 resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 
Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded
 2014-04-09 16:47:40 -07:00
Jae Seo
2d55c116ee am b06cb887: Skip cleaning up TV service/session when the user state is not found 
* commit 'b06cb8870f0407f18bb1225065a93aba2a5de2bf':
  Skip cleaning up TV service/session when the user state is not found
 2014-04-09 19:34:45 +00:00
Jae Seo
b06cb8870f Skip cleaning up TV service/session when the user state is not found 
Bug: 13930813
Change-Id: I64285edaca0bd06d6f6efaeb6b5c30c2ef762902
 2014-04-09 12:10:58 -07:00
Narayan Kamath
a00ed7f725 am a981e3b0: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 
* commit 'a981e3b01ae6af2b67e582f0d1cbb95560d05626':
  Move certain internal activity manager methods to new class.
 2014-04-09 14:03:47 +00:00
Narayan Kamath
a981e3b01a resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp 
Change-Id: I788ca17503e2fd225e205a76d3e7062f71d58316
 2014-04-09 14:57:59 +01:00
Sander Alewijnse
5b25236a87 am c03dea76: Merge "Changed tag name and error strings for PersistentPreferredActivity storage." 
* commit 'c03dea76307163b95a313ba3e887aa94ed01dc2c':
  Changed tag name and error strings for PersistentPreferredActivity storage.
 2014-04-09 09:18:21 +00:00
Sander Alewijnse
c03dea7630 Merge "Changed tag name and error strings for PersistentPreferredActivity storage." 2014-04-09 09:14:50 +00:00
Jeff Brown
7f9599d63c am ea72cdf2: Merge "Move display power controller to display manager service. (DO NOT MERGE)" into klp-modular-dev 
* commit 'ea72cdf22f8efde4d3b872a60587e4b26bc93e43':
  Move display power controller to display manager service. (DO NOT MERGE)
 2014-04-09 09:12:40 +00:00
Jeff Brown
4cf85c740d am 1b03d160: Merge "Move display power controller to display manager service." 
* commit '1b03d160114b1ea553f322e99ca168965daffea8':
  Move display power controller to display manager service.
 2014-04-09 04:44:55 +00:00
Jeff Brown
131206b8a9 Move display power controller to display manager service. 
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes.  Some bits will be cleaned up in
a subsequent patch.

Bug: 13133142
Change-Id: I159a060088344d8e6fcdf9208a1f242960f7ab90
 2014-04-08 21:34:32 -07:00
Jeff Brown
13014b5fe5 Move certain internal activity manager methods to new class. 
This is a little bit of refactoring in preparation for changing how
the power manager notifies system components about changes in power
state.

Deleted the startRunning method since it is no longer useful.

Bug: 13133142
Change-Id: I7f845c61ecc7ee890154ed0cbd90795de609b7ea
 2014-04-08 20:51:07 -07:00
Jeff Brown
ad9ef191f5 Move display power controller to display manager service. (DO NOT MERGE) 
This refactoring is in preparation for enabling the display manager
to have more control over the blanking state of individual displays.
There are no functional changes.  Some bits will be cleaned up in
a subsequent patch.

Bug: 13133142
Change-Id: Ib811835e8757449c7899ac61807029baaf998161
 2014-04-08 20:41:46 -07:00
Amith Yamasani
a7d72d34af am 5784b398: Merge "Launcher APIs and broadcasts for managed profiles" 
* commit '5784b39843bd3d6112352ff3b736a6498107911c':
  Launcher APIs and broadcasts for managed profiles
 2014-04-09 00:45:12 +00:00
Amith Yamasani
5784b39843 Merge "Launcher APIs and broadcasts for managed profiles" 2014-04-08 22:04:20 +00:00
Jae Seo
e0925b6c47 am 3957091b: Initial round of Television Input Framework 
* commit '3957091ba8f08c02b5e781098cb955a5f697a1ff':
  Initial round of Television Input Framework
 2014-04-08 20:39:02 +00:00
Jae Seo
3957091ba8 Initial round of Television Input Framework 
This provides APIs to control and create individual television inputs on
the system which will later be hosted by television applications.

Change-Id: I6866d28e78175a1bff2c32a85c5d77e94d0cd60c
 2014-04-08 13:35:21 -07:00
Kenny Guy
af6f402d37 am cfd3cd6d: Merge "Pipe notifications from related users to listeners." 
* commit 'cfd3cd6df375793d714fe3b6570791e377cab1e5':
  Pipe notifications from related users to listeners.
 2014-04-08 18:05:44 +00:00
Kenny Guy
cfd3cd6df3 Merge "Pipe notifications from related users to listeners." 2014-04-08 17:59:27 +00:00
Amith Yamasani
4f58263d02 Launcher APIs and broadcasts for managed profiles 
UserManager
- Corp badging
- Querying list of managed profiles

Launcher API
- LauncherApps and Service to proxy changes in managed profile
  to the launcher in the primary profile
- Querying and launching launchable apps across profiles

Change-Id: Id8f7b4201afdfb5f414d04156d7b81300119289e
 2014-04-08 10:51:05 -07:00
Kenny Guy
a263e4e438 Pipe notifications from related users to listeners. 
For Listeners built against L or greater
Send notifications from related users to listeners.
Return notifications from related users getAllActiveNotifications
Cancel notifications from related users in cancelAllNotifications
Deprecate StatusBarNotification.getUserId() and expose getUser()
as APIs should use UserHandles.
Deprecate cancelNotification that takes package, id and tag
in favour of one that takes key.

Fix bug that notifications from related users didn't
trigger sounds.

Change-Id: I1b1c20c9f305b8f3c4047bc5720d8e99cdedfe70
 2014-04-08 18:38:38 +01:00
Yohei Yukawa
cf1b3b4791 am 59fee2d5: Merge "Allow IMEs to start/stop receiving onUpdateCursor callback" 
* commit '59fee2d5534965f0986e68e0c3562da5e65e6c45':
  Allow IMEs to start/stop receiving onUpdateCursor callback
 2014-04-08 05:52:14 +00:00
Yohei Yukawa
59fee2d553 Merge "Allow IMEs to start/stop receiving onUpdateCursor callback" 2014-04-08 05:48:45 +00:00
Svetoslav
1376d600d8 Adding render stats APIs to UiAutomation (framework). 
bug:12927198

Change-Id: Iae21481c75ae58dcdab3731bf5f1e2844e29d434
 2014-04-07 17:01:42 -07:00
George Mount
fa3653eafc am f7fbe099: Merge "Allow opaque windows to become translucent." 
* commit 'f7fbe099a80a6955f7c910dbae3c6fecfc0b151a':
  Allow opaque windows to become translucent.
 2014-04-07 23:34:35 +00:00
George Mount
f7fbe099a8 Merge "Allow opaque windows to become translucent." 2014-04-07 23:28:44 +00:00
Craig Mautner
89cca659f9 am 8ea553d0: am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '8ea553d03a84e2fc3ded507dd978fca0dee22e77':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:30:00 +00:00
Craig Mautner
8ea553d03a am 8f2adcb1: am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '8f2adcb10e9ddf2cc06cc4af431c9afb7be9d79a':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:27:55 +00:00
Craig Mautner
8f2adcb10e am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity." 
* commit '228cefa83dd7b95e5581f619bb597808af726f80':
  [ActivityManager] Reduce report ANR on wrong activity.
 2014-04-07 22:21:33 +00:00
Christoph Studer
9a762b3eee am d624a443: Merge "Write eventlog entries for notification panel visibility" 
* commit 'd624a443ec5662d2bf812b6992e783bea225d36d':
  Write eventlog entries for notification panel visibility
 2014-04-07 19:20:45 +00:00
Christoph Studer
d624a443ec Merge "Write eventlog entries for notification panel visibility" 2014-04-07 19:15:22 +00:00
Christoph Studer
23c6e078a5 am eceec528: Merge "NoManService: More efficient notification update" 
* commit 'eceec52894f5713b6f772a92fedd0182eab5c6dc':
  NoManService: More efficient notification update
 2014-04-07 18:55:41 +00:00
Christoph Studer
760ea554d0 Write eventlog entries for notification panel visibility 
Change-Id: Ie7e15ed15739cb5f057c900e1cadf90824b2b4ef
 2014-04-07 14:52:17 -04:00
Christoph Studer
d89188d68e NoManService: More efficient notification update 
Instead of removing the old notification and inserting the
updated notification afterwards, replace the old notification
in-place.

Change-Id: I88962fd2452de191c1d63c142719194282568dcc
 2014-04-07 14:49:05 -04:00
Michael Wright
adde87a645 am 118d1134: Merge "Fix size_t format specifier" 
* commit '118d113478a2c58e7997f926a8dd1bc5ca5f5dc8':
  Fix size_t format specifier
 2014-04-04 23:55:46 +00:00
Michael Wright
118d113478 Merge "Fix size_t format specifier" 2014-04-04 23:51:36 +00:00
Ruchi Kandoi
38915a1c4c am 654d75fe: PowerManager: Fix build 
* commit '654d75fec9e04306a3e08e4ef0c3aa0ec9ef96ea':
  PowerManager: Fix build
 2014-04-04 23:40:47 +00:00
Ruchi Kandoi
654d75fec9 PowerManager: Fix build 
fix build breaks by commit 667372e39bfe01bd15f0803d51ef0e9816f18808

Change-Id: I9e6e0f9146f860d27337cef0551c686ba2d60e23
 2014-04-04 16:34:56 -07:00
Michael Wright
9ecba5269b Fix size_t format specifier 
Change-Id: I7d4ce5e0c7bb4d9e0cc19edf68f30f6b2b054bc7
 2014-04-04 15:29:53 -07:00
Leon Scroggins
c1b717fbb4 am 7716b7d8: Merge "Update to call new Skia APIs." 
* commit '7716b7d8ef9addb913bbc4bdd3153fa36bd1aa87':
  Update to call new Skia APIs.
 2014-04-04 20:35:38 +00:00
Leon Scroggins
7716b7d8ef Merge "Update to call new Skia APIs." 2014-04-04 20:31:00 +00:00