Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249,922 Commits 3 Branches 0 Tags
6501ac3bf9cfd8d940d2c36ab2df72bda1cab52e
Commit Graph

249922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
eea825d67e docs: Fix attr link in support lib docs. 
This issue was breaking the build in nyc-docs; Michael made the fix
there, so I'm cherrypicking it back to our doc branches.

Change-Id: Ie15bd056ebf939270dfcd45dda56946ed41b56f0
(cherry picked from commit ae316f8424)
 2016-05-18 18:08:30 +00:00
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
Baligh Uddin
1e3d25cc5b Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 576a32da20  -s ours

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

Change-Id: Ia3f0a81f0595a1d7f3f24ef1576bd20842da6420
 2016-05-18 18:04:41 +00:00
Baligh Uddin
613174e144 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: cb6e5df633  -s ours

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

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

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

Change-Id: Iff406a441f1bcf9ed234cbd2aab8803c5b7d8fd9
 2016-05-18 18:04:31 +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
5dfa27c64c docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 
am: 51136f409f

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

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

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

Change-Id: I2a0a71595b2af94d9806386877ca510c0cee3271
 2016-05-18 17:14:25 +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
d918a77820 Should check isDeviceSecure in shouldConfirmCredentials 
am: ae13e18c55

* commit 'ae13e18c5561537e062f46ddda8e5dff30d1fe26':
  Should check isDeviceSecure in shouldConfirmCredentials

Change-Id: I13eccf4447ba9eccc1e9be2e9e8d3b33a9df0ee2
 2016-05-18 17:05:47 +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
573c36a484 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: I37d030259db06ca3d1a0d60ecd34c7e51caf5415
 2016-05-18 16:48:05 +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
09e9877dca Merge "Use batching to set firewall rules." into nyc-dev 
am: e821f3d032

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

Change-Id: I0151241fe183699a96c23c10323437310956214b
 2016-05-18 16:34:24 +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
e659fac4c2 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: Ia0053731d074dec0e8438bcf654349dfd6e2c4a0
 2016-05-18 15:50:51 +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
ffc715b8f5 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: I5306ff5f4e9abe6161616873e752cf4d54ed6408
 2016-05-18 15:32:54 +00:00
Philip P. Moltmann
0ba575e431 Merge "Handle printers selected by SelectPrinter activity" into nyc-dev 
am: 746de4e9c8

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

Change-Id: I5060133e2dd3a87f99af3ecc3e1b378291befcc4
 2016-05-18 15:32:48 +00:00
Cheryl Potter
9b9049a373 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: I6092edde07d9feb87def206f5fc2f6e0ebae875a
 2016-05-18 15:28:01 +00:00
Philip P. Moltmann
e951a13916 Declare no print services if 0 print services are enabled. 
Fixes: 28833953
Change-Id: I94e77dc23107fab10d45f51169d71e4da574ee66
 2016-05-18 08:27:02 -07:00
Philip P. Moltmann
3704b11ff9 Move add-printer list headers to the right positions. 
Fixes: 28833479
Change-Id: I0ab955e1a1625e9638da5a76584af988a9f6c342
 2016-05-18 08:26:21 -07: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
8b0faef1a2 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: I21b98fdba0187d4c941d93d67c14e4cf74842729
 2016-05-18 15:16:34 +00:00
Alex Light
0a72ba7d3f Make fake libart for misbehaving apps be loaded. 
Bug: 27775991
Change-Id: Ie4eba211e876ec0643ce6ecf6a110f3cb5e0f57e
(cherry picked from commit 20ed24fc0c)
 2016-05-18 08:14:34 -07: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
Narayan Kamath
34d9a8c333 Merge "PackageManager: Fix reference profile canonicalization." into nyc-dev 
am: 9f33e5cccc

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

Change-Id: Id19a0107733ce3eb53d879e4cc13027dbd509a4f
 2016-05-18 15:09:30 +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
Svet Ganov
2265fddba6 Hide ephemeral API 
bug:28825660

Change-Id: I4e9cdd6e29df44a173136aed13c4039443d944cc
 2016-05-18 07:38:29 -07: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
Julia Reynolds
cc8c594a5c resolve merge conflicts of 5201a62 to nyc-dev-plus-aosp 
Change-Id: I411ed02c96997416dc5e5eb4f289d3c25932babd
 2016-05-18 10:24:28 -04: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
Neil Fuller
c724f2207f Merge "Add support for ICU data pinning in the Zygote" am: 9b1d64410d 
am: 8491b4c05d

* commit '8491b4c05d35b15e0a4c1a0ef2396cbb7169698a':
  Add support for ICU data pinning in the Zygote

Change-Id: I64ba8a96ab8990a051a68cbdb35f4b1de3738d09
 2016-05-18 11:55:44 +00:00
Neil Fuller
8491b4c05d Merge "Add support for ICU data pinning in the Zygote" 
am: 9b1d64410d

* commit '9b1d64410dfddc38ade15d1581de2c89ad79948a':
  Add support for ICU data pinning in the Zygote

Change-Id: I53a2d5f885df5cf633a4a63cb2e3c2bc5c75959e
 2016-05-18 11:51:05 +00:00
Neil Fuller
9b1d64410d Merge "Add support for ICU data pinning in the Zygote" 2016-05-18 11:45:35 +00:00
Nicolas Prevot
d1d0c558b7 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: Ib230238ee0ecb727ef716d844592bda0a86ae56d
 2016-05-18 11:31:35 +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