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

199405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
2af6ec5198 am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev 
* commit 'c14cbac4a3e76d924621b34367cc8b6bcf977908':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second
 2015-08-20 02:03:31 +00:00
Dianne Hackborn
c14cbac4a3 Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev 2015-08-20 01:56:02 +00:00
Dianne Hackborn
cf836079cd Fix issue #23361510: Increase assist timeout from 500ms to 1 second 
Actually, timeout is okay, but need to schedule it on UI thread.

Change-Id: I5b4ffa7caa33815a5223e3ddd08d4809bc7cf7b6
 2015-08-19 18:54:38 -07:00
Jorim Jaggi
c049607331 Save interactive/screen-on state in KeyguardServiceDelegate 
So when SystemUI/Keyguard crashes, we only call onStartedWakingUp and
onScreenTurnedOn when the device is interactive and/or the screen is
on.

Bug: 23344236
Change-Id: I0d0be91ff15d6c552304659956770ab88bb26ba4
 2015-08-19 18:46:48 -07:00
Jeff Sharkey
bbb5717dee am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 
* commit 'f3ad1eabc1fa5252165bfe1516690d1026507f0a':
  Pass underlying volume UUID to StorageVolume.
 2015-08-20 01:33:59 +00:00
Jorim Jaggi
37c1180060 Don't animate in the navigation bar when going to full shade 
Fixes some jank.

Bug: 22537253
Change-Id: Ia816fea6274e38cc2b18e2f28008b3a8341d37f7
 2015-08-20 01:33:18 +00:00
Jeff Sharkey
f3ad1eabc1 Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 2015-08-20 01:28:30 +00:00
David Friedman
28f1794f44 am 6a21a5a1: am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs 
* commit '6a21a5a142dad98c7bc678a9c9d0859d7558da4b':
  Docs: Creating interactive watch faces Bug: 21721463
 2015-08-20 01:24:02 +00:00
David Friedman
6a21a5a142 am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs 
* commit '9f4ddca909e1f7d4274da3282a05494d6fb2f3f9':
  Docs: Creating interactive watch faces Bug: 21721463
 2015-08-20 01:15:08 +00:00
David Friedman
96a3c9a743 am 6540375a: am 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs 
* commit '6540375add2eafe9734ea6a54ebaa2c0587608e8':
  Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836
 2015-08-20 01:14:52 +00:00
David Friedman
6540375add am 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs 
* commit '311f8eeee04937a08dd3576aaab74be19645c14e':
  Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836
 2015-08-20 01:06:29 +00:00
David Friedman
9f4ddca909 am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs 
* commit '56c22d29b8727e55073cede04b51e65eb6125b9f':
  Docs: Creating interactive watch faces Bug: 21721463
 2015-08-20 00:57:50 +00:00
David Friedman
56c22d29b8 Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs 2015-08-20 00:44:58 +00:00
David Friedman
e6705bf25d Docs: Creating interactive watch faces 
Bug: 21721463

Training module and related API-reference documentation. This is new
material for Android Wear D(iamond) release.

Change-Id: I9959bca50fd96812abd7cfb693139986bc59b133
 2015-08-19 17:41:57 -07:00
Jorim Jaggi
909788500b Fix jank in wake-and-unlock while pulsing 
- Don't hide keyguard after the animation is done, because this
would cause a measure in the middle of the fade animation.
- Don't use a layer for the notification panel in this case - we
don't need it and it only adds latency.
- Speed up the whole thing a bit because the animation is now
smoother.

Bug: 23225107
Change-Id: Ie8264c4d0e62bd6a78227e04b9900b4348ddd649
 2015-08-19 17:14:08 -07:00
Jorim Jaggi
71448a7003 Don't call authenticate immediately after getting valid fingerprint 
After gettin a callback onAuthenticationSucceded we set the
fingerprint listening state to false. However, when waking up, we
immediately started listening again because the state was false.
Protect against that by only calling authenticate only once, except
when the unlock doesn't go through because unlocking with fingerprint
is not allowed.

Also fixes some animation "jank" because of the state messup.

Bug: 23304421
Change-Id: Ic83ac0f1590dd4f8017bb55dca9e19a60cfdf99f
 2015-08-19 17:06:29 -07:00