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

243450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Solovay
eddf9bfc36 docs: Quick release-notes fix am: 29329dd3f1 
am: 1f279c1ab0

* commit '1f279c1ab030fb78ba193d9b91999bc8d98ae300':
  docs: Quick release-notes fix

Change-Id: Ic785186da0288b565c5ee4fca4b748290aa640e7
 2016-05-18 18:08:18 +00:00
Andrew Solovay
1f279c1ab0 docs: Quick release-notes fix 
am: 29329dd3f1

* commit '29329dd3f154bf33f1a2c85b0f49ad232d6f1dcc':
  docs: Quick release-notes fix

Change-Id: If1c368952b60be8df8457c38e4d4e7a4ac22e525
 2016-05-18 18:04:08 +00:00
Baligh Uddin
576a32da20 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:57:26 +00:00
Baligh Uddin
cb6e5df633 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:57:19 +00:00
Baligh Uddin
e6ee2d7e11 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:54:34 +00:00
Bert McMeen
51136f409f docs: Downloads change for \'I\' build am: 90433cf4d8 
am: 996c9839d6

* commit '996c9839d657ddb98c5c69f902cd33d45bea7663':
  docs: Downloads change for 'I' build

Change-Id: I027756f3e51efdd81e01f2a2fbe268044ca3c9b5
 2016-05-18 17:37:17 +00:00
Bert McMeen
996c9839d6 docs: Downloads change for \'I\' build 
am: 90433cf4d8

* commit '90433cf4d8de469568202a7ca15a14d76db73f2a':
  docs: Downloads change for 'I' build

Change-Id: I9230b82f48d391245882150af67c949e6ae102dc
 2016-05-18 17:32:01 +00:00
Andrew Solovay
29329dd3f1 docs: Quick release-notes fix 
DD asked to pull this sentence out. See first comment for doc stage
location, but if it builds and stages without trouble I'll go ahead
and submit.

Change-Id: Ie9844cf60bfd723dea8dbfd42eb04465dde84ae3
 2016-05-18 10:29:52 -07:00
TreeHugger Robot
0d902adbbc Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev 2016-05-18 17:09:46 +00:00
Tony Mak
ae13e18c55 Should check isDeviceSecure in shouldConfirmCredentials 
The NPE is because createConfirmDeviceCredentialIntent returns a null
intent when it founds that user does not set a secure lock.
So the fix is we should check is the user set a secure lock screen as well.

The reason the crash only happens in multi-window flow because
we have null checking in
the normal flow (i.e. interceptWithConfirmCredentialsIfNeeded).
But I think we better check it explicitly.

Bug: 28716456
Change-Id: Ib204cd02c0007bd1df36908bb3b5254ec4ffb914
 2016-05-18 16:58:13 +00:00
Mady Mellor
048cabdbcb Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev 2016-05-18 16:43:12 +00:00
Bert McMeen
90433cf4d8 docs: Downloads change for 'I' build 
Bug: 28833659
Change-Id: Ifd5865d78960a58a6e8238225bc206978e84eb8f
 2016-05-18 09:34:09 -07:00
TreeHugger Robot
e821f3d032 Merge "Use batching to set firewall rules." into nyc-dev 2016-05-18 16:26:45 +00:00
Jaewan Kim
4e08800a7e Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev 2016-05-18 15:46:46 +00:00
Robert Sesek
f45bc095c6 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 2016-05-18 15:25:41 +00:00
Philip P. Moltmann
746de4e9c8 Merge "Handle printers selected by SelectPrinter activity" into nyc-dev 2016-05-18 15:24:21 +00:00
Cheryl Potter
3e9304127e docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616 am: 06c815fc74 
am: d45800d2e3

* commit 'd45800d2e31550520dd6f3210b309ae3abaa4471':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: Id7298a4811e157030f51646618b600a13a65ad77
 2016-05-18 15:22:34 +00:00
Cheryl Potter
d45800d2e3 docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 am: d1da82f616 
am: 06c815fc74

* commit '06c815fc74de27e7ca053f81c8972e268810de13':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: I9597dba7e1f5c13c88dc1f3d2ba516418d679260
 2016-05-18 15:17:44 +00:00
Cheryl Potter
06c815fc74 docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592 
am: d1da82f616

* commit 'd1da82f61614388c181ccbc9d4de2cfb6522c071':
  docs: Add redirect for Android Device Monitor and change redirects for Virtual Device Config and Run/Debug Config b/28826469 b/28705592

Change-Id: I0c2acc2d5204d34c177b534d7dd4b5ae5200f98f
 2016-05-18 15:11:54 +00:00
Michael Wright
7e91ec88ef Merge changes from topic 'bad-attr-buildfix' into nyc-dev 
* changes:
  Fix attr link in support lib docs.
  Revert "Revert "docs: Creating new support library revision history page""
 2016-05-18 15:07:37 +00:00
Narayan Kamath
9f33e5cccc Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev 2016-05-18 15:04:19 +00:00
Michael Wright
ae316f8424 Fix attr link in support lib docs. 
It accidentally pointed to the media router resources rather than the
app compat ones.

Change-Id: Ie15bd056ebf939270dfcd45dda56946ed41b56f0
 2016-05-18 15:58:39 +01:00
Michael Wright
9363b31196 Revert "Revert "docs: Creating new support library revision history page"" 
This reverts commit 982fd043357759bfdf619bc24f3a5f4366a3aac0.
 2016-05-18 15:24:36 +01:00
Julia Reynolds
5201a6246d Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev 2016-05-18 14:09:50 +00:00
Narayan Kamath
6d99f79671 PackageManager: Fix reference profile canonicalization. 
Foreign dex markers are named in the runtime by calling realpath(3) on the input
dexfile path and replacing "/" with "@". On the Java side, we're using
File.getCanonicalPath, which is similar but isn't quite the same. It tries
to call realpath() directly, but if that fails, it resorts to a series of
increasingly desperate measures to calculate a "canonical path". We just
use realpath instead.

Also, don't attempt to delete a profile if canonicalization fails.

bug: 28740848
Change-Id: Ie5d5af590187e793db633342a42b923865e5c005
 2016-05-18 12:33:56 +00:00
Nicolas Prévot
bbd26bc023 Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev 2016-05-18 11:21:45 +00:00
Bart Sears
982fd04335 Revert "docs: Creating new support library revision history page" 
This reverts commit 09e9d24bcf9d80c3946fdbf0989bade053466d35.

Change-Id: Idbece8b39491eea7e2324916a5a88f08f2623f1f
 2016-05-18 07:22:20 +00:00
Joe Fernandez
f6e624b5a5 Merge "docs: Pages for Instant Apps" into mnc-io-docs am: ad1639e276 
am: 24d753f134

* commit '24d753f134b8da8b1f3d2f764f48f8d66e9a0164':
  docs: Pages for Instant Apps

Change-Id: Ic0fadeb9c32152ca9366f7e7a86fae008e49cad7
 2016-05-18 07:15:09 +00:00
Eric Schmidt
24d753f134 Merge "docs: Pages for Instant Apps" into mnc-io-docs 
am: ad1639e276

* commit 'ad1639e276bdac48946977b89f8959efa14e0c8f':
  docs: Pages for Instant Apps

Change-Id: I1910b63e5891d62244470f540454a3e0a482cdce
 2016-05-18 07:10:14 +00:00
Joe Fernandez
ad1639e276 Merge "docs: Pages for Instant Apps" into mnc-io-docs 2016-05-18 07:04:52 +00:00
David Friedman
c25a09d495 Docs: Final changes to DP3 docs. am: 82c668ffc0 
am: f28da5297c

* commit 'f28da5297cf4076a378c83215ef93da5ce19b2e2':
  Docs: Final changes to DP3 docs.

Change-Id: Id4c144f150cfed36e0e74797d51b3be70fa423a1
 2016-05-18 07:04:42 +00:00
David Friedman
f28da5297c Docs: Final changes to DP3 docs. 
am: 82c668ffc0

* commit '82c668ffc0d72343f51c9203c5085a01ac6f8c09':
  Docs: Final changes to DP3 docs.

Change-Id: Ic273a03cb136829468dafd01129cd4d9a8609446
 2016-05-18 07:01:40 +00:00
David Friedman
82c668ffc0 Docs: Final changes to DP3 docs. 
Change-Id: Ia79f288e6231ef37c25a826653dd9b2cf465542f
 2016-05-17 23:53:21 -07:00
Eric Schmidt
ff81597f9b docs: Pages for Instant Apps 
Bug: 28317418

Change-Id: I4a6df533435f1637dbfd6225c345985366cce7b3
 2016-05-17 23:53:13 -07:00
Joe Fernandez
449d6435ca Merge "docs: Wear Preview 2 - fixes and improvements" into mnc-io-docs am: 19fc346171 
am: 14e1f1cd33

* commit '14e1f1cd333f2e38f753bb3461d42479c3849698':
  docs: Wear Preview 2 - fixes and improvements

Change-Id: I7e24a12745c8072467c2e4e4dd7a03fa05f48d61
 2016-05-18 06:46:55 +00:00
Joe Fernandez
14e1f1cd33 Merge "docs: Wear Preview 2 - fixes and improvements" into mnc-io-docs 
am: 19fc346171

* commit '19fc34617181419dd6ea70c03692c92fa035bb8f':
  docs: Wear Preview 2 - fixes and improvements

Change-Id: Ia7be06924d42c9fcc27ffd06d0d7c58372bda5bb
 2016-05-18 06:42:01 +00:00
Joe Fernandez
19fc346171 Merge "docs: Wear Preview 2 - fixes and improvements" into mnc-io-docs 2016-05-18 06:32:57 +00:00
Joe Fernandez
4672669ff9 docs: Wear Preview 2 - fixes and improvements 
Change-Id: I0b5ea60157dfa21aa17765571d26c06f5ff866df
 2016-05-17 23:23:47 -07:00
David Friedman
06d085ecf1 Merge "Docs: Some typo fixes for Wear 2.0 Preview docs." into mnc-io-docs am: 36af257133 
am: 08016e21d3

* commit '08016e21d3920049a9d10c93293e80aeaf8696fc':
  Docs: Some typo fixes for Wear 2.0 Preview docs.

Change-Id: Ia492ec891ac101039e9915fde55d09be66352b53
 2016-05-18 06:12:16 +00:00
David Friedman
08016e21d3 Merge "Docs: Some typo fixes for Wear 2.0 Preview docs." into mnc-io-docs 
am: 36af257133

* commit '36af25713385103a6d1085345232bc82e6dde217':
  Docs: Some typo fixes for Wear 2.0 Preview docs.

Change-Id: Idc67ab630863012d3002f63b21ac4a8fee989d11
 2016-05-18 06:09:44 +00:00
David Friedman
36af257133 Merge "Docs: Some typo fixes for Wear 2.0 Preview docs." into mnc-io-docs 2016-05-18 05:57:40 +00:00
David Friedman
69fe28ea2b Docs: Some typo fixes for Wear 2.0 Preview docs. 
Change-Id: I87d6d14c95f6350aa36ee71b99cf86b82cc0902a
 2016-05-17 22:55:04 -07:00
David Friedman
0cc059436a Merge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into mnc-io-docs am: e293ff3bf1 
am: fc1bb6e14d

* commit 'fc1bb6e14dac01bd1bc9496cd53169178041d4e0':
  Docs: Near-final changes for Android N/Google IO. Continues ag/1037250.

Change-Id: I2cc0383575a5152159bab7f9b48b39aa147877b2
 2016-05-18 05:31:05 +00:00
David Friedman
fc1bb6e14d Merge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into mnc-io-docs 
am: e293ff3bf1

* commit 'e293ff3bf12f5e215d0d6d5e21fa2315ba4d9fdb':
  Docs: Near-final changes for Android N/Google IO. Continues ag/1037250.

Change-Id: Ib62978421d147abf1afaac1e6640a91324fd328e
 2016-05-18 05:27:56 +00:00
David Friedman
e293ff3bf1 Merge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into mnc-io-docs 2016-05-18 05:21:24 +00:00
Joe Fernandez
6f054c4a78 Merge "docs: Wear Preview 2.0 support page updates" into mnc-io-docs am: b308d13fe2 
am: 5bc0128ca0

* commit '5bc0128ca0b1f6b8e3bb475013b74ec5d1e460a3':
  docs: Wear Preview 2.0 support page updates

Change-Id: I30e4f95d27cebb281303e720d2f872f36c778a3e
 2016-05-18 05:08:33 +00:00
David Friedman
ab751a8946 Merge "Docs: Revisions to Wear 2.0 Preview API Overview page" into mnc-io-docs am: 08c32762bb 
am: 4850be7bf9

* commit '4850be7bf9b54bd717789dc26622df8b8679de42':
  Docs: Revisions to Wear 2.0 Preview API Overview page

Change-Id: I77ec3c35534a95b86d193bbed38f3ecb2347ba49
 2016-05-18 05:08:28 +00:00
David Friedman
202373932f Docs: Near-final changes for Android N/Google IO. Continues ag/1037250. 
Change-Id: Ie30cac9f4eb955fc2a06b98348855c71941b9c8d
 2016-05-17 22:06:28 -07:00
Joe Fernandez
5bc0128ca0 Merge "docs: Wear Preview 2.0 support page updates" into mnc-io-docs 
am: b308d13fe2

* commit 'b308d13fe2d184df101b3418ace57464346c0972':
  docs: Wear Preview 2.0 support page updates

Change-Id: I7055293b960cacd0cf72c968438012e5cd3a9a46
 2016-05-18 05:03:30 +00:00
David Friedman
4850be7bf9 Merge "Docs: Revisions to Wear 2.0 Preview API Overview page" into mnc-io-docs 
am: 08c32762bb

* commit '08c32762bbbdadd395597c1490cae065c80d5f45':
  Docs: Revisions to Wear 2.0 Preview API Overview page

Change-Id: I447873601ebf36a56866d11657023948e773f943
 2016-05-18 05:03:27 +00:00