Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,497 Commits 3 Branches 0 Tags
ffe7746437e8f06cc7dd2571c3354973791c8a8a
Commit Graph

246497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
8ddccb8723 docs: Fix attr link in support lib docs. am: eea825d67e am: 252b996fee am: 97fd87bd5f 
am: 1a9158e271

* commit '1a9158e271e413da884c13e8022142a3aa00213f':
  docs: Fix attr link in support lib docs.

Change-Id: I7d51f3289b551877939cd0b5677faa0dac5f01d1
 2016-05-18 18:42:18 +00:00
Michael Wright
1a9158e271 docs: Fix attr link in support lib docs. am: eea825d67e am: 252b996fee 
am: 97fd87bd5f

* commit '97fd87bd5fbe4ccc1cca4f3eda2df7006fefecf3':
  docs: Fix attr link in support lib docs.

Change-Id: I5b502a43efade5c85c8cd625e3d26f6200140362
 2016-05-18 18:34:10 +00:00
Michael Wright
97fd87bd5f docs: Fix attr link in support lib docs. am: eea825d67e 
am: 252b996fee

* commit '252b996feea8b9d5c9c0101ca35753099feba15a':
  docs: Fix attr link in support lib docs.

Change-Id: I0164d7eed51b156767ddabc63804044db9e54be4
 2016-05-18 18:29:03 +00:00
Michael Wright
252b996fee docs: Fix attr link in support lib docs. 
am: eea825d67e

* commit 'eea825d67e271ac4adc48fd696d8cf7f4cbe0dc5':
  docs: Fix attr link in support lib docs.

Change-Id: I5901dcbd2ed759ea559dc071309329eb008950dc
 2016-05-18 18:21:55 +00:00
Andrew Solovay
bec732d0a4 docs: Quick release-notes fix am: 29329dd3f1 am: 1f279c1ab0 
am: eddf9bfc36

* commit 'eddf9bfc36aea60736695c3da9264414d7629ceb':
  docs: Quick release-notes fix

Change-Id: I27b568b1e6de8b60a4a5496617de8b02c58edfbc
 2016-05-18 18:16:58 +00:00
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
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
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
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
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
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
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
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
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