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

29177 Commits

Author SHA1 Message Date
destradaa
3b152d9504 Fix NPE in AR hardware binding sequence. 
b/22772433

To keep the old Watcher binding sequence backwards compatible,
it is required to ensure that the callback is only invoked if
the feature is supported by the platform, and an instance is
available.

Change-Id: I0a6335f10647184abdad3ee1583b505160a3308f
 2015-07-27 17:14:03 -07:00
Daniel Estrada Alva
15bb40a58b Merge "Add callback-based support for Hardware Activity Recognition. b/17112184" 2015-07-27 21:41:58 +00:00
Adam Lesinski
deabddb34e am d07d8446: am 62fbfcd9: am d7f4a078: am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev 
* commit 'd07d8446dfb9f648a6027a7a35f34781eba51dcc':
  BatteryStats: Prevent BatteryService from blocking
 2015-07-27 21:17:38 +00:00
Adam Lesinski
d07d8446df am 62fbfcd9: am d7f4a078: am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev 
* commit '62fbfcd9ee86f8e2ee5d7083a6e9f5857bbbe6d9':
  BatteryStats: Prevent BatteryService from blocking
 2015-07-27 21:03:35 +00:00
Julia Reynolds
4cfa238971 am 98cbe497: am c2c611c4: am 13ad04e7: am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev 
* commit '98cbe497f58aaf8ab8bc106d79a3aed567d9b58b':
  Allow Settings to set background data restrict on secondary users.
 2015-07-27 21:03:17 +00:00
Julia Reynolds
98cbe497f5 am c2c611c4: am 13ad04e7: am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev 
* commit 'c2c611c4e5024bc9405cae4c9ffe9d72599f9751':
  Allow Settings to set background data restrict on secondary users.
 2015-07-27 20:49:09 +00:00
destradaa
6e2fe75624 Add callback-based support for Hardware Activity Recognition. 
b/17112184

Add a callback-based mechanism for GmsCore to connect to Hardware Activity
Recognition. This allows GmsCore to stop polling to identify if the Android
platform supports the functionality or not.

Change-Id: I8f9459cbd15eecd70f6919c6551e6f7a663c732f
 2015-07-27 13:40:21 -07:00
Adam Lesinski
d7f4a07879 am 48a90091: am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev 
* commit '48a90091b1f50043f000929e35d9aae5e8c457e3':
  BatteryStats: Prevent BatteryService from blocking
 2015-07-27 20:33:37 +00:00
Adam Lesinski
48a90091b1 am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev 
* commit 'fc28d6fc9dec30e4cd98cc894d596f7df986f5b9':
  BatteryStats: Prevent BatteryService from blocking
 2015-07-27 20:21:20 +00:00
Julia Reynolds
13ad04e76b am 3df17a6d: am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev 
* commit '3df17a6d01507de4690601f948ec776f48ccba87':
  Allow Settings to set background data restrict on secondary users.
 2015-07-27 20:20:41 +00:00
Julia Reynolds
3df17a6d01 am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev 
* commit 'f68e0236a67a8d6f8ec167df0daf332221149b51':
  Allow Settings to set background data restrict on secondary users.
 2015-07-27 20:03:28 +00:00
Adam Lesinski
fc28d6fc9d Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev 2015-07-27 20:01:34 +00:00
Julia Reynolds
f68e0236a6 Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev 2015-07-27 19:51:24 +00:00
Julia Reynolds
72f83d6a05 Allow Settings to set background data restrict on secondary users. 
Bug: 22721091
Change-Id: Iadfbd25f75f233f2c3c080e0de05b0244572b6cd
 2015-07-27 15:10:42 -04:00
Nick Kralevich
aba7a0f3cb am fb2927df: am 73612fbb: am e942b459: Merge "ActivityManagerService: delete unnecessary mkdir" 
* commit 'fb2927dfbc0b0cd43cad2be494ce46a9a447a6e7':
  ActivityManagerService: delete unnecessary mkdir
 2015-07-27 19:01:28 +00:00
Fyodor Kupolov
aaf1484851 am d1f1985f: am 4b3f6caf: am d815c04b: am d7d1ea45: am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev 
* commit 'd1f1985f33df9915dbd1895433c2c74a0493613c':
  Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
 2015-07-27 19:01:21 +00:00
Nick Kralevich
fb2927dfbc am 73612fbb: am e942b459: Merge "ActivityManagerService: delete unnecessary mkdir" 
* commit '73612fbbc99af331f0345479231538b5f0f2452e':
  ActivityManagerService: delete unnecessary mkdir
 2015-07-27 18:50:26 +00:00
Fyodor Kupolov
d1f1985f33 am 4b3f6caf: am d815c04b: am d7d1ea45: am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev 
* commit '4b3f6caf9e443811c6d94f9c909249786dac614f':
  Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
 2015-07-27 18:47:25 +00:00
Adam Lesinski
d7616ef73c BatteryStats: Prevent BatteryService from blocking 
BatteryService is a low level service, and we shouldn't have it
block in BatteryStatsService while collecting external data from
components like WiFi. Deadlocks can occur this way.

Bug:22559655
Change-Id: I64026453d191695eb583a47163ab6f48f882b085
 2015-07-27 11:43:05 -07:00
Fyodor Kupolov
d815c04b12 am d7d1ea45: am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev 
* commit 'd7d1ea45984efdb6a514e97312045ac5b67ccb22':
  Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
 2015-07-27 18:19:02 +00:00
Fyodor Kupolov
d7d1ea4598 am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev 
* commit 'b83b5fa641847ee1d533253ba5e1a3e13913b9d9':
  Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION
 2015-07-27 18:05:57 +00:00
Fyodor Kupolov
b83b5fa641 Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev 2015-07-27 17:27:02 +00:00
Erik Kline
b1ca5ed701 am 05cf335f: am 04159d0b: am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev 
* commit '05cf335fc4e9cd50ddac809a47bb59ca459cc67e':
  Change to connectivitycheck.gstatic.com
 2015-07-27 06:09:09 +00:00
Erik Kline
05cf335fc4 am 04159d0b: am f0927733: am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev 
* commit '04159d0b8ea468947cdb349be007f99ba25baa92':
  Change to connectivitycheck.gstatic.com
 2015-07-27 05:59:10 +00:00
Erik Kline
f0927733a3 am 8c54a8e8: am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev 
* commit '8c54a8e8c7f40037ac871d27e0a800e9c271fae9':
  Change to connectivitycheck.gstatic.com
 2015-07-27 05:23:23 +00:00
Erik Kline
8c54a8e8c7 am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev 
* commit 'a7bdace2627cb4cd55ac7c182d9e093b3a1ffb7b':
  Change to connectivitycheck.gstatic.com
 2015-07-27 04:32:19 +00:00
Erik Kline
a7bdace262 Merge "Change to connectivitycheck.gstatic.com" into mnc-dev 2015-07-27 02:35:09 +00:00
Nick Kralevich
bd6b7e0973 ActivityManagerService: delete unnecessary mkdir 
/data/anr is now created in init.rc. This code is unnecessary.

Bug: 22385254
Change-Id: Ide6c9749c27668523f9316049a1d40d961f2276d
 2015-07-25 21:17:43 -07:00
Jorim Jaggi
d6e7bab0e8 am 9fd390c6: am 5efe21e4: am 5b65bb1b: am b6c6e45a: am f3255489: Fix ambient display 
* commit '9fd390c6b998eea2795a20ef0ff9f88018e03a4f':
  Fix ambient display
 2015-07-25 16:47:58 +00:00
Adam Lesinski
2765d57153 am 6593daa3: am a758499e: am d92a3957: am eee604ff: am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev 
* commit '6593daa39eaf71785cdf68f3899b69f8f6010046':
  BatteryStats: Decode wakeup reasons in Java
 2015-07-25 16:47:49 +00:00
John Reck
e92c622650 am 2a548609: am f43f6c5a: am aad38f60: am 50aded0c: am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev 
* commit '2a5486090f06e7caaf7dec3e885bbc2a48a877da':
  Use process state to filter >= UI_HIDDEN
 2015-07-25 16:47:12 +00:00
Jorim Jaggi
9fd390c6b9 am 5efe21e4: am 5b65bb1b: am b6c6e45a: am f3255489: Fix ambient display 
* commit '5efe21e4bfb585a4fb3759c9b5c13b6cf5caba81':
  Fix ambient display
 2015-07-25 16:36:30 +00:00
Adam Lesinski
6593daa39e am a758499e: am d92a3957: am eee604ff: am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev 
* commit 'a758499ee2c981eb2000661678860da68f2f9de2':
  BatteryStats: Decode wakeup reasons in Java
 2015-07-25 16:36:22 +00:00
John Reck
2a5486090f am f43f6c5a: am aad38f60: am 50aded0c: am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev 
* commit 'f43f6c5a05791adc9a3da745d88ddd17d2c81f5f':
  Use process state to filter >= UI_HIDDEN
 2015-07-25 16:35:57 +00:00
Jorim Jaggi
5b65bb1bc7 am b6c6e45a: am f3255489: Fix ambient display 
* commit 'b6c6e45a04a52a7ece08dd63636b1f71e7322653':
  Fix ambient display
 2015-07-25 15:54:50 +00:00
Adam Lesinski
d92a39574e am eee604ff: am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev 
* commit 'eee604ff8bd76bc2a4f00b6612e92047bfe95d80':
  BatteryStats: Decode wakeup reasons in Java
 2015-07-25 15:54:43 +00:00
John Reck
aad38f60f8 am 50aded0c: am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev 
* commit '50aded0c8668b60953237813560b1cca8ccf6b66':
  Use process state to filter >= UI_HIDDEN
 2015-07-25 15:53:39 +00:00
Jorim Jaggi
b6c6e45a04 am f3255489: Fix ambient display 
* commit 'f325548992d449a2da564216191edb5ad2773bfd':
  Fix ambient display
 2015-07-25 01:54:21 +00:00
Jorim Jaggi
f325548992 Fix ambient display 
Due to a refactoring for touch, wake and unlock for fingerprint
devices PhoneWindowManager now waits for Keyguard to draw its first
frame in all cases, including when screen turns on for pulsing.
However, since in this case the device is not awake, we need to check
for screen on instead of awakeness when proceeding with the wake-up
sequence. Without this change, screen on was blocked forever in the
pulsing case.

Bug: 22605235
Change-Id: Ib6089fd14b673e62347f2c9108d9a6783caa26b7
 2015-07-25 01:42:29 +00:00
Adam Lesinski
eee604ff8b am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev 
* commit '2a493532e6ce44fd6dec07a22c3a016de80ccc46':
  BatteryStats: Decode wakeup reasons in Java
 2015-07-25 01:26:44 +00:00
Adam Lesinski
2a493532e6 Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev 2015-07-25 01:14:07 +00:00
John Reck
50aded0c86 am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev 
* commit '68fbd6a4968eb6e5f3d74f471387c5e62981fba2':
  Use process state to filter >= UI_HIDDEN
 2015-07-25 00:53:01 +00:00
Fyodor Kupolov
ce09a024f8 Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION 
Call to checkPermission(ACCESS_COARSE_LOCATION) should return
PERMISSION_GRANTED, when package only has ACCESS_FINE_LOCATION permission

Bug: 21852542
Change-Id: I53fe2945784213693f59e7bfccc524276ea8c189
 2015-07-24 16:54:15 -07:00
Adam Lesinski
515702c29e BatteryStats: Decode wakeup reasons in Java 
Wakeup reasons come from drivers and sometimes are malformed UTF-8.
Decode them in Java so we can easily replace malformed characters
and still have user visible strings.

Bug:22368519
Change-Id: Ifade1a7fcdf6545e7e344d74390200c329430e14
 2015-07-24 12:56:37 -07:00
destradaa
56b47f84c6 Ensure retry of NTP refresh. 
If connectivity is not ideal, the refresh of NTP time might fail.
In such cases we always need to retry when connectivity is available.

Change-Id: If28008c0f19d3fac2bc092953f3c40fd12fe9210
 2015-07-24 10:58:41 -07:00
John Reck
66a3675013 am 0e5a5161: am d79117c4: am 9ba771bb: am c2db381e: am 6b66a4a8: use findProcess instead of getProcess 
* commit '0e5a5161e6999a58a86acd404ee1a229e180647d':
  use findProcess instead of getProcess
 2015-07-24 05:16:55 +00:00
Svetoslav Ganov
12058d065e am 2dd71cc1: am 74521d3a: am 7bda4b96: am 79355545: am 28762e61: Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev 
* commit '2dd71cc16565d0183d940987aad168a4efcf6423':
  Keep default permission grants uninstalling a sys package upgrade
 2015-07-24 05:16:30 +00:00
Yohei Yukawa
fb8cfd8c2a am c99ecb34: am c0e0b1e3: am 646f9da9: am 4ff108f0: am 0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev 
* commit 'c99ecb34f8b1631fbe6bdd53994d1d02b96c096b':
  Don't rely on broadcast intent for waking up input method.
 2015-07-24 05:16:05 +00:00
Svetoslav Ganov
5cdca2a812 am cb731204: am ce4668b6: am 3fce45b6: am 54f1db79: am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev 
* commit 'cb731204c47034b6ce3e6a96b127fafc322a3625':
  Reset permissions and app links when clearing app preferences - framework
 2015-07-24 05:15:36 +00:00
Svetoslav Ganov
9bec9660a3 am 7ddfc7b0: am 1c37dc81: am dd12420e: am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev 
* commit '7ddfc7b0245d600605efc4d764378f40d6861437':
  Shut down UiAutomationConnection without a lock held
 2015-07-24 05:15:29 +00:00