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

198368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cheryl Potter
41fc973c14 am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs 
* commit '251f24790757cf38bffbd6cec06c6503f99299dd':
  docs: changed red to yellow in code snippet
 2015-08-21 23:08:00 +00:00
Fyodor Kupolov
e6c64508ab Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev 2015-08-21 23:04:09 +00:00
Cheryl Potter
251f247907 am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs 
* commit 'dc35d48f4fdc2016f900207ebc934e5a57bd9265':
  docs: changed red to yellow in code snippet
 2015-08-21 23:01:17 +00:00
Cheryl Potter
dc35d48f4f Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs 2015-08-21 22:51:30 +00:00
Jim Miller
74d9c2aad1 Merge "Fix type-o in FingerprintManager documentation" into mnc-dev 2015-08-21 21:59:51 +00:00
Fyodor Kupolov
7d35fc3898 Fixed a typo in convertRestrictionsToBundle JavaDoc 
Bug: 23408097
Change-Id: Ie06c33aa7b9a953dec645d1763e27dcb506764f0
 2015-08-21 11:25:55 -07: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
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
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
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
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
1773ded846 Merge "Fixed key comparison in equals method" into mnc-dev 2015-08-20 19:47:38 +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
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
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
Jim Miller
5f69ca3be3 Fix type-o in FingerprintManager documentation 
Fixes bug 23274133

Change-Id: I15607d0e64c0b11d36d0e0d47ea88c42101e4dde
 2015-08-20 05:06:36 +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
Jeff Sharkey
f3ad1eabc1 Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev 2015-08-20 01:28:30 +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
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
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
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
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
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
Amith Yamasani
e3de6c5df5 Merge "Fix crashes when removing work profile" into mnc-dev 2015-08-19 20:10:30 +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
Sebastien Hertz
18089ceb71 Allow debugging only for apps forked from zygote DO NOT MERGE 
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322c)

Change-Id: I2400ecc8aea7579c43300efccf288b69f70eef53
 2015-08-19 17:12:34 +02:00
Paul Jensen
aae613d961 Don't mark NetworkRequests restricted when they don't have restricted caps 
Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted.  Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.

Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
 2015-08-19 11:08:38 -04:00
Sebastien Hertz
ff8dc21278 Allow debugging only for apps forked from zygote 
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322c)

Change-Id: Ib5b6d3bc4d45389993c3c54226df5a7b72479d19
 2015-08-19 11:25:56 +02:00
Jorim Jaggi
8b8fa3e934 Fix SysUI crash when no metadata is provided 
Bug: 23327474
Change-Id: I4903c0812c9677e1b31e1f645e3d6f1a03150c38
 2015-08-19 01:34:33 +00:00