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

207964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Friedman
eea063d918 am 96a3c9a7: am 6540375a: am 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs 
* commit '96a3c9a7430452f47fb39080cef932c979622519':
  Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836
 2015-08-20 01:24:08 +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
Elliott Hughes
ce4fbb4da6 Merge "zygote: fix memory leak when fork process" 2015-08-20 01:14:00 +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
Tom Cherry
c2de7a7e87 bundle init.rc contents with its service 
Bug: 23186545
Change-Id: I080e73d6a124873c2ddd0fba85315d7082faf3f5
 2015-08-19 17:24:47 -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
Tyler Gunn
393a93abaf am 7d4cf23f: am 9e191aa6: am a6562603: am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check. 
* commit '7d4cf23f8a57b73055a5d9310df074dc149be577':
  Fix incorrect android.telecom.Call.Details equality check.
 2015-08-19 23:03:14 +00:00
Tyler Gunn
7d4cf23f8a am 9e191aa6: am a6562603: am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check. 
* commit '9e191aa634c1eb3b24ced704b7fc6c5e1e4ef9c0':
  Fix incorrect android.telecom.Call.Details equality check.
 2015-08-19 22:56:43 +00:00
Tyler Gunn
9e191aa634 am a6562603: am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check. 
* commit 'a65626031017517331fd402541b5e8f072c46a34':
  Fix incorrect android.telecom.Call.Details equality check.
 2015-08-19 22:41:14 +00:00
David Friedman
311f8eeee0 am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs 
* commit 'ed54f60ae4d57ed1e9cc963fc3baf5de91d51c53':
  Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836
 2015-08-19 22:31:15 +00:00
Tyler Gunn
a656260310 am 1e9bfc64: Fix incorrect android.telecom.Call.Details equality check. 
* commit '1e9bfc6461d3fe5455c9d7a21414ec66695b5798':
  Fix incorrect android.telecom.Call.Details equality check.
 2015-08-19 22:29:51 +00:00
David Friedman
ed54f60ae4 Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs 2015-08-19 22:21:41 +00:00
David Friedman
aee78937e4 Docs: Updating, clarifying Debug-over-WiFi instructions. 
Bug: 21371836

Change-Id: Ieef63c416c85f778e4b00ef08b434040709c2493
 2015-08-19 15:19:18 -07:00
Jeff Sharkey
8e2ea2a9f1 Pass underlying volume UUID to StorageVolume. 
To help MediaProvider uniquely identify storage devices, pass through
the UUID of the underlying private storage volume.

Bug: 23329611
Change-Id: I22ee7ea98fcb208d7797310acb3396a3f074f09b
 2015-08-19 14:16:05 -07:00
Lorenzo Colitti
a5bfd73ab6 am ab5e962e: am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit 'ab5e962e1dd05799980342757edd8e83f4a76a8e':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:15:22 +00:00
Adrian Roos
df50c12af5 am 6abed070: am 359f5944: am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev 
* commit '6abed0706be80764c4cffe46fcb8e01ec8d9be95':
  Fix wakelock leak for dozing
 2015-08-19 21:15:16 +00:00
Lorenzo Colitti
ab5e962e1d am d7121f56: am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit 'd7121f565138c8ec31bcc7a5d1cef57dc21cf546':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:09:43 +00:00
Adrian Roos
6abed0706b am 359f5944: am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev 
* commit '359f59445d872086ca0c01919d8112c47e2af8fa':
  Fix wakelock leak for dozing
 2015-08-19 21:09:37 +00:00
Chien-Yu Chen
84551d61fd am 6fdab993: am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit '6fdab993919a1784676782ad1c67068a7f8a7fdc':
  Camera2: Handle surface size change
 2015-08-19 21:02:37 +00:00
Lorenzo Colitti
d7121f5651 am 0257c82f: am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit '0257c82fa122243e97e4a1f4ef4bc4b8c21bd692':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 21:01:33 +00:00
Adrian Roos
359f59445d am 06a86644: Merge "Fix wakelock leak for dozing" into mnc-dr-dev 
* commit '06a86644cca0621696afc38db02f2fe2010f120c':
  Fix wakelock leak for dozing
 2015-08-19 21:01:28 +00:00
Lorenzo Colitti
0257c82fa1 am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev 
* commit '11e84bde9e98cb4b777a67208989d259883e9375':
  Don't mark NetworkRequests restricted when they don't have restricted caps
 2015-08-19 20:54:48 +00:00
Chien-Yu Chen
6fdab99391 am 86d86c2e: am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit '86d86c2e7c08a99b226820a1a5e53876d9171086':
  Camera2: Handle surface size change
 2015-08-19 20:53:16 +00:00
Tyler Gunn
1e9bfc6461 Fix incorrect android.telecom.Call.Details equality check. 
The the android.telecom.Call.Details class provides its own equals
implementation.  Recently added in M is to also check if the mExtras
and mIntentExtras are different.  Unfortunately, Bundles do not implement
equals.  As a result when Telecom calls are parceled and sent to the
InCallServices, this means that the internalUpdate method will always
assume that the Details of a call have changed, even if they have not.
This was causing a LOT of extra calls to onUpdate in the InCall UI (2x the
amount).  Although there is still room for improvement in the number of
callbacks from Telecom, this fix prevents a pretty significant regression
on that front.

Bug: 23218195
Change-Id: I128e996faf60376ed3df1dc848a97c4a7b0482ee
 2015-08-19 20:52:13 +00:00
Adrian Roos
06a86644cc Merge "Fix wakelock leak for dozing" into mnc-dr-dev 2015-08-19 20:50:04 +00:00
Lorenzo Colitti
11e84bde9e Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into mnc-dev 2015-08-19 20:48:31 +00:00
Chien-Yu Chen
86d86c2e7c am c3aa7f3a: Merge "Camera2: Handle surface size change" into mnc-dr-dev 
* commit 'c3aa7f3a7564f36db58d8a9a5470fd64f6fa282b':
  Camera2: Handle surface size change
 2015-08-19 20:48:27 +00:00
Amith Yamasani
a79f37c31f am 6e6fbc93: am 7102fb5f: am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit '6e6fbc932ac5355bc90cc1f98b38d46281b1aeaf':
  Fix crashes when removing work profile
 2015-08-19 20:40:52 +00:00
Chien-Yu Chen
c3aa7f3a75 Merge "Camera2: Handle surface size change" into mnc-dr-dev 2015-08-19 20:40:11 +00:00
Amith Yamasani
6e6fbc932a am 7102fb5f: am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit '7102fb5f5282b2a0c68691a434c407539e334ada':
  Fix crashes when removing work profile
 2015-08-19 20:34:23 +00:00
Amith Yamasani
7102fb5f52 am e1df482c: am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit 'e1df482c173d975923dba2d3cf644f5a0fadee17':
  Fix crashes when removing work profile
 2015-08-19 20:25:26 +00:00
Amith Yamasani
e1df482c17 am e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev 
* commit 'e3de6c5df5a94e627c5ee0f188cbb066233a3dd0':
  Fix crashes when removing work profile
 2015-08-19 20:19:28 +00:00
Jorim Jaggi
5fb4b98bdd Fix wakelock leak for dozing 
Bug: 23344235
Change-Id: I7f4233cfe15bdd3e8cc5f01a70707bdde9fc1737
 2015-08-19 13:14:28 -07:00
Amith Yamasani
e3de6c5df5 Merge "Fix crashes when removing work profile" into mnc-dev 2015-08-19 20:10:30 +00:00
Dianne Hackborn
5a1234fabf am 81b4616f: am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '81b4616f9f8ecf1be2db999acbd8504c33201eb9':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:53:24 +00:00
Dianne Hackborn
81b4616f9f am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit 'aa8c876e1dd159c37fa00d7ed6f3fd228c74e30b':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:45:41 +00:00
Dianne Hackborn
aa8c876e1d am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '5c577bab3b4cd9bf74a09368be5d73aed627f6a5':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:39:56 +00:00
Dianne Hackborn
5c577bab3b am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '29cd880890825ce15a1b2da977bcb1796db6f4e3':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:31:20 +00:00
Dianne Hackborn
29cd880890 Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 2015-08-19 18:25:29 +00:00
Elliott Hughes
9a6ec5862c Move aapt2 off HAVE_MS_C_RUNTIME. 
Change-Id: Iea75251bde4d8795213ea235db446065e1fea7b5
(cherry picked from commit c301ab8d6ab553ee0e641558f9fbe2f974a70e52)
 2015-08-19 17:56:44 +00:00
Geoff Mendal
35090b322f am cdeeecb0: (-s ours) am 37aa01a3: (-s ours) am 399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'cdeeecb05607f302a306929c806dece0332eb182':
  Import translations. DO NOT MERGE
 2015-08-19 16:30:11 +00:00
Zhentao Sun
00447eeb99 am 4caf6b97: am 880ef585: am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev 
* commit '4caf6b9784d0102844f74ea65da75affc0750896':
  Launched camera in the correct user.
 2015-08-19 16:30:05 +00:00
Geoff Mendal
cdeeecb056 am 37aa01a3: (-s ours) am 399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '37aa01a34da149fa893e731032fd0aee32321396':
  Import translations. DO NOT MERGE
 2015-08-19 16:24:41 +00:00
Zhentao Sun
4caf6b9784 am 880ef585: am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev 
* commit '880ef585ab1887bd7f95a1a668d11057d86dd964':
  Launched camera in the correct user.
 2015-08-19 16:24:35 +00:00