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

200406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
83526e3bbd am 86bed406: Fix fingerprint listening state race conditions 
* commit '86bed40605e407459496ee2bfdf6b8af1ae1a581':
  Fix fingerprint listening state race conditions
 2015-08-22 00:16:29 +00:00
Jorim Jaggi
86bed40605 Fix fingerprint listening state race conditions 
When calling cancel() on the cancellation signal, it doesn't happen
immediately. Now, because of a state messup during boot, we go
through the sequence

startListeningForFingerprint
stopListeningForFingerprint
startListeningForFingerprint

However, the cancellation callback from stopListeningForFingeprint
happened AFTER the second startListeningForFingerprint, so we assumed
that fingerprint detection was not running anymore but in reality it
was - leading to weird states and all kinds of small state messups.

Introduce a state machine to track when we we called cancel but
waiting for the confirmation of FingerprintService in order to track
this properly.

Bug: 23380500
Change-Id: I403479fb749cf7c22b73611b69698e8b771777d0
 2015-08-21 19:29:05 +00:00
Svetoslav Ganov
e96b80f3de am 446c00a2: am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev 
* commit '446c00a2919da5b4ea0bdf08f72ac4f95125ea45':
  Add missing removed permissions to the platform manifest
 2015-08-21 12:49:42 +00:00
Svetoslav Ganov
446c00a291 am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev 
* commit 'cb59747de7222bc7310162c4174f7b460c34adef':
  Add missing removed permissions to the platform manifest
 2015-08-21 12:41:29 +00:00
Svetoslav Ganov
cb59747de7 Merge "Add missing removed permissions to the platform manifest" into mnc-dev 2015-08-21 12:34:37 +00:00
Sebastien Hertz
36970140f3 am 79cb3ef9: am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '79cb3ef99eec49df785c1b93a743db32c1388af8':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:23:42 +00:00
Sebastien Hertz
79cb3ef99e am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '7cd2d3431c157fa20576e84a8a9f04ba4f7e1dd9':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:14:23 +00:00
Sebastien Hertz
7cd2d3431c am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '852c6178629d3bdcd7d2c958379b0b71539f460f':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:10:18 +00:00
Sebastien Hertz
852c617862 am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit 'b63e291d05aa9522b2ef9b399936c52079820c3f':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 11:02:27 +00:00
Sebastien Hertz
b63e291d05 am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '88556ac22157ddfe154be6ee7c8853e0a81dc83c':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:53:07 +00:00
Sebastien Hertz
88556ac221 am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '599dc2bd1c809ae5a413fc3800fc3fbb71432de6':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:37:46 +00:00
Sebastien Hertz
599dc2bd1c am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '50af68e74a756d0fc81eda2a3580dbcf70362d42':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:29:30 +00:00
Sebastien Hertz
50af68e74a am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '55f86b1811f0411a5d685d6c97772b846a706e19':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:18:38 +00:00
Sebastien Hertz
b1d01411f4 am 5d2faf11: am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev 
* commit '5d2faf111e18fc44163ec4fe3cc8c6151d3e6aeb':
  Allow debugging only for apps forked from zygote
 2015-08-21 10:10:18 +00:00
Sebastien Hertz
55f86b1811 am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:09:22 +00:00
Sebastien Hertz
5d2faf111e am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev 
* commit 'c5151d2c378e4dad4d1312caf2021d7515297d06':
  Allow debugging only for apps forked from zygote
 2015-08-21 10:03:51 +00:00
Sebastien Hertz
9e7a0ddb65 am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '18089ceb71ad4ce2332096b8e7b5f8c1f8e263db':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 09:50:24 +00:00
Sebastien Hertz
c5151d2c37 am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev 
* commit 'b60bc0ece2b2714845eff37c97cb19d41a308122':
  Allow debugging only for apps forked from zygote
 2015-08-21 09:49:11 +00:00
Sebastien Hertz
b60bc0ece2 resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev 
Change-Id: I4cb38241b5efab1eb7af161e1589fa477a473a39
 2015-08-21 09:53:41 +02:00
Sebastien Hertz
a2d193183f am 87a786af: am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote 
* commit '87a786afdba8ec94036c62fb58265d364a7064ae':
  Allow debugging only for apps forked from zygote
 2015-08-21 07:19:10 +00:00
Sebastien Hertz
87a786afdb am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote 
* commit '445ab7fa43f32ac1a256b15f5ab2bd619e9711e4':
  Allow debugging only for apps forked from zygote
 2015-08-21 07:08:43 +00:00
Sebastien Hertz
445ab7fa43 am ff8dc212: Allow debugging only for apps forked from zygote 
* commit 'ff8dc21278b19b22ed8dc9f9475850838336d351':
  Allow debugging only for apps forked from zygote
 2015-08-21 07:01:02 +00:00
Christopher Tate
b893c1ba49 am 99b252ad: am ddc2536d: Make sure to kill restore-at-install full-data targets after restore 
* commit '99b252adc78a0450b7a881aff93a77f6d0e160ce':
  Make sure to kill restore-at-install full-data targets after restore
 2015-08-20 23:15:29 +00:00
Christopher Tate
99b252adc7 am ddc2536d: Make sure to kill restore-at-install full-data targets after restore 
* commit 'ddc2536d2b6f277a7828278a066be874e4f9502e':
  Make sure to kill restore-at-install full-data targets after restore
 2015-08-20 23:09:39 +00:00
Christopher Tate
ddc2536d2b Make sure to kill restore-at-install full-data targets after restore 
Specifically: correctly distinguish the "I want to restore my own data"
case, in which the app is intentionally not killed, from the single-package
restore at install operation.

Bug 23357388

Change-Id: Ic50ac39fe942af1f6ec9e04a32d81a39b70a0b2b
 2015-08-20 15:08:55 -07:00
Alan Viverette
63e9875a3d am 786529f2: am 54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev 
* commit '786529f2d15fe9b9083eb9ac46c8305f29cdf8e9':
  Translate ripple mask to account for drawable bounds
 2015-08-20 20:44:40 +00:00
Alan Viverette
786529f2d1 am 54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev 
* commit '54c807e713c0d04134108b7d13e4abd467e318d5':
  Translate ripple mask to account for drawable bounds
 2015-08-20 20:38:24 +00:00
Alan Viverette
54c807e713 Merge "Translate ripple mask to account for drawable bounds" into mnc-dev 2015-08-20 20:31:27 +00:00
Alan Viverette
f0d69b9e33 Translate ripple mask to account for drawable bounds 
Bug: 23354529
Change-Id: Iaa4fde6b37645492cf902f141f975bdef8e7e14e
 2015-08-20 16:27:21 -04:00
Fyodor Kupolov
78985f3fb5 am ea57b592: am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev 
* commit 'ea57b59222571e7e82d8b628e86b4ff0bdbe3f49':
  Fixed key comparison in equals method
 2015-08-20 20:02:42 +00:00
Fyodor Kupolov
ea57b59222 am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev 
* commit '1773ded84684593f459b19f3271d471b38f14f85':
  Fixed key comparison in equals method
 2015-08-20 19:53:29 +00:00
Fyodor Kupolov
1773ded846 Merge "Fixed key comparison in equals method" into mnc-dev 2015-08-20 19:47:38 +00:00
David Friedman
740eef52e8 am 33074733: am 46eddef4: am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190) 
* commit '33074733f015e3e8f84cf0aaebdfbe859f0f6800':
  Docs: Fixes to interactive-watch-face docs (CL 743190)
 2015-08-20 18:16:11 +00:00
David Friedman
33074733f0 am 46eddef4: am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190) 
* commit '46eddef4d46e11269c4f13d695c46cdd7f071a34':
  Docs: Fixes to interactive-watch-face docs (CL 743190)
 2015-08-20 18:07:18 +00:00
David Friedman
46eddef4d4 am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190) 
* commit '504623e1a7b20ff7ce66ec487fb329f4b3d2c3cf':
  Docs: Fixes to interactive-watch-face docs (CL 743190)
 2015-08-20 17:53:49 +00:00
Tyler Gunn
51e8df2ee6 am a001f7ae: Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev 
* commit 'a001f7ae7fde0418a6f8e455f88a2d7dc3c392ce':
  Add carrier config variable to hide merge call button
 2015-08-20 17:28:14 +00:00
Mitchell Wills
edf93764f0 am b460cc88: Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev 
* commit 'b460cc88865bbdafe3f343e43bd08382c6745fe0':
  Remove wifi enabled checking from settings TetherUtil
 2015-08-20 17:28:01 +00:00
Fyodor Kupolov
1af7a83939 Fixed key comparison in equals method 
Bug: 23376695
Change-Id: Ie4bd55a88f5f86fd8de7b087d0a5f1755951e90d
 2015-08-20 10:24:14 -07:00
Tyler Gunn
a001f7ae7f Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev 2015-08-20 17:19:17 +00:00
David Friedman
504623e1a7 am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190) 
* commit '5389f46ce4245a6a0cfc931160ea13dab17f6590':
  Docs: Fixes to interactive-watch-face docs (CL 743190)
 2015-08-20 16:59:08 +00:00
Mitchell Wills
b460cc8886 Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev 2015-08-20 16:58:02 +00:00
Sharvil Nanavati
69504b5355 Merge "DO NOT MERGE Work around for not getting APN info in NetworkInfo object." into cw-e-dev 2015-08-20 16:45:52 +00:00
Sharvil Nanavati
2aa0523f79 DO NOT MERGE Work around for not getting APN info in NetworkInfo object. 
This change is a workaround to an issue where the APN name is missing
in the CONNECTIVITY_ACTION intent. Submitting this patch so we can
unblock AVL testing.

Bug: 22908453
Change-Id: I67f67872b8636e63404bd6c2cf7835feb586f254
 2015-08-20 09:38:30 -07:00
David Friedman
5389f46ce4 Docs: Fixes to interactive-watch-face docs (CL 743190) 
Change-Id: I2b9c7d7afbf5583da01808027869e1e98873c7d1
 2015-08-20 08:51:39 -07:00
Svet Ganov
f1418ae65b Add missing removed permissions to the platform manifest 
We need to keep in the manifest as normal hidden permissions
all removed dangerous ones to ensure backwards compatibility
as apps may be gating operations based on whether they have
a removed permission.

bug:23377184

Change-Id: I105bd646c4594d85c501f53a10ea393ee50046bc
 2015-08-20 07:08:26 -07:00
Jorim Jaggi
7de9fbca0b am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev 
* commit '2364af2083f4f0b00ae8275aed1aeb4193f4b89d':
  Save interactive/screen-on state in KeyguardServiceDelegate
 2015-08-20 02:25:02 +00:00
Jorim Jaggi
a2737beea1 am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev 
* commit '1fa7384a101450c4619ed43e176d5a54aa0a54f3':
  Fix jank in wake-and-unlock while pulsing
  Don't call authenticate immediately after getting valid fingerprint
 2015-08-20 02:24:56 +00:00
Jorim Jaggi
2364af2083 Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev 2015-08-20 02:18:36 +00:00
Jorim Jaggi
1fa7384a10 Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev 
* changes:
  Fix jank in wake-and-unlock while pulsing
  Don't call authenticate immediately after getting valid fingerprint
 2015-08-20 02:18:20 +00:00
Dianne Hackborn
dc4442f1a6 am 2af6ec51: am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev 
* commit '2af6ec5198ed6edf7576c19a358afddcc4068ff7':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second
 2015-08-20 02:12:22 +00:00