Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,853 Commits 3 Branches 0 Tags
e71736cd684e22fb0a449e800922b83c33072e5c
Commit Graph

244853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
e71736cd68 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 576a32da20  -s ours

* commit '576a32da207ec435aa466985c827bc56709db5eb':
  Import translations. DO NOT MERGE

Change-Id: Ia94fd9edaeef8625d85988d42cd56547a0bbdcd0
 2016-05-18 18:04:34 +00:00
Baligh Uddin
d17ac6f18f Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cb6e5df633  -s ours

* commit 'cb6e5df633fec75832f80b1d89ae6cac60a9be83':
  Import translations. DO NOT MERGE

Change-Id: I1b809754ebd93b4e45786a0b22b6d24940d3a6cd
 2016-05-18 18:04:30 +00:00
Baligh Uddin
c3190d5fb2 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: e6ee2d7e11  -s ours

* commit 'e6ee2d7e1188a0397bdd198708a0c87b8bbe00d7':
  Import translations. DO NOT MERGE

Change-Id: Icbd5a05067e61eb95513823ad9f90840dd1f0674
 2016-05-18 18:04:27 +00:00
Baligh Uddin
5ac773c8f7 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-18 17:57:28 +00:00
Baligh Uddin
576a32da20 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:57:26 +00:00
Baligh Uddin
eb93f0668c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-18 17:57:21 +00:00
Baligh Uddin
cb6e5df633 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:57:19 +00:00
Baligh Uddin
06994e5e8c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-18 17:57:14 +00:00
Baligh Uddin
123637175e Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-18 17:54:36 +00:00
Baligh Uddin
e6ee2d7e11 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 17:54:34 +00:00
Bert McMeen
7d9f487457 docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 
am: 51136f409f

* commit '51136f409f62f0623d8014bae132e4c9edfe1366':
  docs: Downloads change for 'I' build

Change-Id: I68f037b13c2a02dc2a3c34027f13f5300078ebe4
 2016-05-18 17:42:42 +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
Sudheer Shanka
db9d529499 Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev 
am: 0d902adbbc

* commit '0d902adbbc729f87f94fd70d9a6331e551108bc0':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: Iaad04447c2fffd0f6b80c22bfea576e5d2b28856
 2016-05-18 17:14:29 +00:00
TreeHugger Robot
0d902adbbc Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev 2016-05-18 17:09:46 +00:00
Tony Mak
4d4fe58a32 Should check isDeviceSecure in shouldConfirmCredentials 
am: ae13e18c55

* commit 'ae13e18c5561537e062f46ddda8e5dff30d1fe26':
  Should check isDeviceSecure in shouldConfirmCredentials

Change-Id: I21caafc40cdaa65cddca374bd5ec02ad18ae12be
 2016-05-18 17:05:44 +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
689b8026ed Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev 
am: 048cabdbcb

* commit '048cabdbcbc262869a5b737a22ccddb5ef0d76f9':
  Ensure background is shown behind gear when notifications overlap

Change-Id: Idd2839db81350906ba36f1a17feebfc239d5d2c2
 2016-05-18 16:47:57 +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
Felipe Leme
ece1932178 Merge "Use batching to set firewall rules." into nyc-dev 
am: e821f3d032

* commit 'e821f3d032b4cd738a9b61549559b8b76b3ae09e':
  Use batching to set firewall rules.

Change-Id: I93bc587f8dc3bff15efcd394f4dc03d30b5e287f
 2016-05-18 16:34:19 +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
7b1e4a02c3 Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev 
am: 4e08800a7e

* commit '4e08800a7e196cc94c1ed3fdcf6a492aa86055d2':
  PIP: Fix NPE when enters Recents with PIP

Change-Id: I6e8172d0a5fe6d6f12474b188b1e1ca52b927bfd
 2016-05-18 15:50:59 +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
a83b4cfc74 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev 
am: f45bc095c6

* commit 'f45bc095c6cef916f5f801fb320b3413f0fc099a':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

Change-Id: Ie16d11c4aaa515a570b8b717241d556903198d24
 2016-05-18 15:32:18 +00:00
Philip P. Moltmann
8e5c3a004a Merge "Handle printers selected by SelectPrinter activity" into nyc-dev 
am: 746de4e9c8

* commit '746de4e9c87d3068643a97a3b0b5709ffdbb4ad6':
  Handle printers selected by SelectPrinter activity

Change-Id: Ie22f3d5d2b483a8a6354cb9968e939a80b6b1855
 2016-05-18 15:32:15 +00:00
Cheryl Potter
a663282036 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 
am: 3e9304127e

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

Change-Id: I21df6a1f604d5b67ef136f45fccfc6ba8746da5e
 2016-05-18 15:28:00 +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
Michael Wright
f205245cf4 Merge changes from topic \'bad-attr-buildfix\' into nyc-dev 
am: 7e91ec88ef

* commit '7e91ec88ef61343345defe58ea968228b10d003a':
  Fix attr link in support lib docs.
  Revert "Revert "docs: Creating new support library revision history page""

Change-Id: Ie2bdbbb96678a1e5cf6fe5e21d722335749cd7f7
 2016-05-18 15:13:13 +00:00
Narayan Kamath
16d3fae494 Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev 
am: 9f33e5cccc

* commit '9f33e5cccc8816ed8d41716eb172ec28b9935946':
  PackageManager: Fix reference profile canonicalization.

Change-Id: I089272599a7d03b6e4b210cf5cc2c38a5659eeeb
 2016-05-18 15:13:10 +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 982fd04335.
 2016-05-18 15:24:36 +01:00
Toni Barzic
0ca33e84a1 Merge "Handle PhoneStatusBarPolicy user switch callbacks on main thread" into nyc-dev 
am: 5201a6246d

* commit '5201a6246d12830d0bb766d59e22b0320f2f99dc':
  Handle PhoneStatusBarPolicy user switch callbacks on main thread

Change-Id: I561be9cf58d0a43abd43d98cf1ee717241f10ef1
 2016-05-18 14:16:01 +00: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 Prevot
05f2a86b3d Merge "Refactor how StatusBarPolicy knows if keyguard is visible." into nyc-dev 
am: bbd26bc023

* commit 'bbd26bc023992ee7bc6a0e682d4a343dfe3dc848':
  Refactor how StatusBarPolicy knows if keyguard is visible.

Change-Id: I782d354549ba3185d4779a2e8b3ac6d0724e22ec
 2016-05-18 11:31:28 +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
88d1749129 Revert "docs: Creating new support library revision history page" 
am: 982fd04335

* commit '982fd043357759bfdf619bc24f3a5f4366a3aac0':
  Revert "docs: Creating new support library revision history page"

Change-Id: Ie001e5763e62360cc6db568ffd51e43ae35e4554
 2016-05-18 07:30:29 +00:00
Bart Sears
982fd04335 Revert "docs: Creating new support library revision history page" 
This reverts commit 09e9d24bcf.

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

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

Change-Id: Iadcac0e0eb32ba5ea699d73b9528a84bd901d624
 2016-05-18 07:22:15 +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
David Friedman
6233066daa Docs: Final changes to DP3 docs. am: 82c668ffc0 am: f28da5297c 
am: c25a09d495

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

Change-Id: I9725ed07e7099d7bf746d26e8a21f450e273fea5
 2016-05-18 07:10:11 +00:00
Joe Fernandez
ad1639e276 Merge "docs: Pages for Instant Apps" into mnc-io-docs 2016-05-18 07:04:52 +00:00