Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,738 Commits 3 Branches 0 Tags
eae9d6dae32ac01ac2ba0959eef0858a8c919c19
Commit Graph

198738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
eae9d6dae3 am 3dad6c66: am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev 
* commit '3dad6c661f76b69475bb38b950d74f5de3bb8a8f':
  add ticker to enqueue message for easier debugging
 2015-07-27 13:35:47 +00:00
Chris Wren
3dad6c661f am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev 
* commit '45a0bb18fec5b137a540e160cecd4ffd091098d9':
  add ticker to enqueue message for easier debugging
 2015-07-27 13:21:35 +00:00
Chris Wren
45a0bb18fe Merge "add ticker to enqueue message for easier debugging" into mnc-dev 2015-07-27 13:09:15 +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
Geoff Mendal
763611dd04 am 16467c1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '16467c1db06eecb29d2ae5b334faf9dec7afc0ac':
  Import translations. DO NOT MERGE
 2015-07-25 15:55:33 +00:00
Geoff Mendal
12d1d98905 am 213e0c1d: (-s ours) Import translations. DO NOT MERGE 
* commit '213e0c1daddb7a651335a484299bdebc77b9ab1c':
  Import translations. DO NOT MERGE
 2015-07-25 15:55:24 +00:00
Jeff Sharkey
4c864be103 am 35f4b6a2: am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev 
* commit '35f4b6a2460ef702bae604ca87b6c7a70f61c0f7':
  Also check app-ops on path-permissions.
 2015-07-25 15:55:04 +00:00
Selim Cinek
756d5ac2ed am e0c0e93a: am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev 
* commit 'e0c0e93a0f4582fca58733be7a4b1d7a6e6e8029':
  Fixed wake to unlock when the device has never been unlocked
 2015-07-25 15:54:54 +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
Selim Cinek
d2e40fabca am 8588b331: am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev 
* commit '8588b3317c848e93998616c981f8c997197b4222':
  Adapted the behavior when unlocking with fingerprint is not allowed
 2015-07-25 15:53:57 +00:00
Chris Banes
a62f3ee859 am 67b4db0c: am c174de0a: am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs 
* commit '67b4db0c5401ab81359fe145efcc91173154cae8':
  v22.2.1 support api diff
 2015-07-25 15:53:52 +00:00
Adrian Roos
4fd4f4b476 am 047b2bfd: am 384b5d20: am a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI 
* commit '047b2bfd4fe19174ae3d8c79cd3767642d33f4ba':
  Prevent insanely long passwords from crashing SystemUI
 2015-07-25 15:53:45 +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
Geoff Mendal
16467c1db0 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-25 11:52:57 +00:00
Geoff Mendal
a2217d6495 Import translations. DO NOT MERGE 
Change-Id: I0e1bbb09bf26900df54dd55b5b9b8a320173a16f
Auto-generated-cl: translation import
 2015-07-25 03:41:38 -05:00
Geoff Mendal
213e0c1dad Import translations. DO NOT MERGE 
Change-Id: Ic21adc47d8ff107c078aac141365b70289d9960c
Auto-generated-cl: translation import
 2015-07-24 23:46:06 -07:00
Jeff Sharkey
35f4b6a246 am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev 
* commit '8be305dd6582f154c5a5894034a35fc8ec225b71':
  Also check app-ops on path-permissions.
 2015-07-25 02:20:25 +00:00
Jeff Sharkey
8be305dd65 Merge "Also check app-ops on path-permissions." into mnc-dev 2015-07-25 02:05:56 +00:00
Selim Cinek
e0c0e93a0f am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev 
* commit 'd9f1a0c3a42bcc1f7b8cd82be8eed60f5438f091':
  Fixed wake to unlock when the device has never been unlocked
 2015-07-25 01:54:26 +00:00
Jorim Jaggi
b6c6e45a04 am f3255489: Fix ambient display 
* commit 'f325548992d449a2da564216191edb5ad2773bfd':
  Fix ambient display
 2015-07-25 01:54:21 +00:00
Selim Cinek
d9f1a0c3a4 Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev 2015-07-25 01:48:16 +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
Selim Cinek
ad7310f013 Fixed wake to unlock when the device has never been unlocked 
Previously the fingerprint could still unlock the device
when waking up with the fingerprint sensor, since we were not
checking if it is allowed.

Bug: 22622999
Change-Id: I039a4e0701c1f161f227cf6f1d25e8147548db47
 2015-07-24 18:15:43 -07:00
Adam Lesinski
2a493532e6 Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev 2015-07-25 01:14:07 +00:00
Selim Cinek
8588b3317c am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev 
* commit 'f8acd1d8d698f367bc267699a0a84c21f7c7d548':
  Adapted the behavior when unlocking with fingerprint is not allowed
 2015-07-25 00:59:57 +00:00
Chris Banes
67b4db0c54 am c174de0a: am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs 
* commit 'c174de0ab353e2ecaf6e1728e6899bffcfefe48e':
  v22.2.1 support api diff
 2015-07-25 00:59:23 +00:00
Adrian Roos
047b2bfd4f am 384b5d20: am a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI 
* commit '384b5d20b64c279f29eb494bae37d039c652f492':
  Prevent insanely long passwords from crashing SystemUI
 2015-07-25 00:59:17 +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
Selim Cinek
f8acd1d8d6 Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev 2015-07-25 00:33:14 +00:00
Chris Banes
c174de0ab3 am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs 
* commit '5442932a4befd66394fb155ae95a2eaadd2001a9':
  v22.2.1 support api diff
 2015-07-24 22:41:35 +00:00
Adrian Roos
384b5d20b6 am a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI 
* commit 'a65de4fde99c84ae7c7cab242e8e1e46ee6c0a5d':
  Prevent insanely long passwords from crashing SystemUI
 2015-07-24 22:41:26 +00:00
Jeff Sharkey
0e621c3921 Also check app-ops on path-permissions. 
Any place that we check permissions we also need to check any
app-ops associated with those permissions.  In the case of providers
with both <provider> and <path-permission> permissions, track and
report the strongest app-ops denial.

Bug: 22718722
Change-Id: I45e62de39b04d16d071558ad980b701667cfcb9a
 2015-07-24 15:16:11 -07:00
John Reck
68fbd6a496 Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev 2015-07-24 22:15:47 +00:00
Adrian Roos
16b7492240 am b6c18ab8: am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev 
* commit 'b6c18ab8cc33b1e813b5e1d54441d7192da3bfec':
  Fix janky add guest transition
 2015-07-24 22:09:25 +00:00
Adrian Roos
b6c18ab8cc am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev 
* commit '4629f1c58c00480b0dbd5a541a26b703b0770bf4':
  Fix janky add guest transition
 2015-07-24 21:57:16 +00:00
Andreas Gampe
851f518555 am 08edf246: am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev 
* commit '08edf246e97b60098a1e7c661b99412577f231f0':
  Frameworks/base: Hand fingerprint to ART
 2015-07-24 21:56:56 +00:00
Adrian Roos
4629f1c58c Merge "Fix janky add guest transition" into mnc-dev 2015-07-24 21:42:46 +00:00
Andreas Gampe
08edf246e9 am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev 
* commit '9a755e3650270439861f5ac1e0c51caa7c4a7d3d':
  Frameworks/base: Hand fingerprint to ART
 2015-07-24 21:39:24 +00:00
Andreas Gampe
9a755e3650 Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev 2015-07-24 21:25:09 +00:00
Andreas Gampe
e60825033f Frameworks/base: Hand fingerprint to ART 
To allow ANR dumps to be symbolized easily, hand the build
fingerprint to the runtime.

Bug: 22693991
Change-Id: Ibd3d3b3bd65dce84acfb97a487807d6f280a9508
 2015-07-24 14:19:44 -07:00
Robert Greenwalt
98961ea000 am 7385aca1: am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev 
* commit '7385aca1a2bcb702cbf49b4cd3d1cf60972f9407':
  DO NOT MERGE Enhance local log.
 2015-07-24 20:22:48 +00:00
Chris Banes
5442932a4b am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs 
* commit '7b099152b6bd5844c30464a7c08dde2e22124491':
  v22.2.1 support api diff
 2015-07-24 20:19:09 +00:00
Robert Greenwalt
7385aca1a2 am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev 
* commit 'f0bead280154fd9a5d2c07b1186e10fcfeed55fc':
  DO NOT MERGE Enhance local log.
 2015-07-24 20:06:31 +00: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
Robert Greenwalt
f0bead2801 Merge "DO NOT MERGE Enhance local log." into mnc-dev 2015-07-24 19:54:07 +00:00
Amith Yamasani
8582f9f759 am 21b0b3ac: am 2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev 
* commit '21b0b3ac436262a01d7e7c42fb48a758a2a0bbe8':
  Require permission for internal broadcast
 2015-07-24 19:47:39 +00:00