Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tony Mak
8d167899c2 Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 
am: 4d4fe58a32

* commit '4d4fe58a329c73a9a97870577a145b0864203a64':
  Should check isDeviceSecure in shouldConfirmCredentials

Change-Id: I5ef98757b6aa411e4c2ab016cf22dd620f0fc3f1
 2016-05-18 17:15:07 +00:00
Tony Mak
b008d581fc Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 
am: d918a77820

* commit 'd918a778201c06721abe66208bcda413bcb7edcb':
  Should check isDeviceSecure in shouldConfirmCredentials

Change-Id: I90caa2d494ae370854392515593ce6c5fbfbdbe1
 2016-05-18 17:15:06 +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
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
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
Android Build Merger (Role)
bf8a1a2593 Merge "Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev am: 048cabdbcb am: 689b8026ed" into nyc-mr1-dev-plus-aosp 2016-05-18 16:54:19 +00:00
Mady Mellor
f0b665f6e1 Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev am: 048cabdbcb 
am: 573c36a484

* commit '573c36a484f77d2bb41aa851ddce29c5b73302e4':
  Ensure background is shown behind gear when notifications overlap

Change-Id: I88d26ac1012d63215f209ee79e644785f8603a1b
 2016-05-18 16:53:52 +00:00
Mady Mellor
57485986fe Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev am: 048cabdbcb 
am: 689b8026ed

* commit '689b8026ed4647f4b745878911543de17c5bf850':
  Ensure background is shown behind gear when notifications overlap

Change-Id: Iba550c29d71feb477d56f918ade251b1f5701cd2
 2016-05-18 16:53:52 +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
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
Android Build Merger (Role)
4fb8d20700 Merge "Merge "Use batching to set firewall rules." into nyc-dev am: e821f3d032 am: ece1932178" into nyc-mr1-dev-plus-aosp 2016-05-18 16:37:43 +00:00
Felipe Leme
e151f0519f Merge "Use batching to set firewall rules." into nyc-dev am: e821f3d032 
am: 09e9877dca

* commit '09e9877dca1db74339e893b3bf7942a1f9d263a5':
  Use batching to set firewall rules.

Change-Id: I13cea9d3960c2d9f851aaa766b6f743f8486d7e7
 2016-05-18 16:37:15 +00:00
Felipe Leme
ff5d1a3b01 Merge "Use batching to set firewall rules." into nyc-dev am: e821f3d032 
am: ece1932178

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

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

* commit '7b1e4a02c3dddd79f7136bd264d519cf0fd29ba8':

Change-Id: I12d84f6cd95ab55771298678b89510ee95e75269
 2016-05-18 15:56:09 +00:00
Jaewan Kim
c1093b1dca Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev am: 4e08800a7e 
am: e659fac4c2

* commit 'e659fac4c272a42eb575b9d66881f34a8ceeb66b':
  PIP: Fix NPE when enters Recents with PIP

Change-Id: I029f82f0f7c9673bbb7010daabe18017d889d83d
 2016-05-18 15:53:32 +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
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
Android Build Merger (Role)
1deeeba0b3 Merge "Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev am: f45bc095c6 am: a83b4cfc74" into nyc-mr1-dev-plus-aosp 2016-05-18 15:39:58 +00:00
Android Build Merger (Role)
0579e6a21d Merge "Merge "Handle printers selected by SelectPrinter activity" into nyc-dev am: 746de4e9c8 am: 8e5c3a004a" into nyc-mr1-dev-plus-aosp 2016-05-18 15:39:47 +00:00
Robert Sesek
abeb54ee75 Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev am: f45bc095c6 
am: a83b4cfc74

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

Change-Id: I331ee57d710539b3988ff71b96e2f6155da75c9a
 2016-05-18 15:39:06 +00:00
Robert Sesek
4b7f83870b Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev am: f45bc095c6 
am: ffc715b8f5

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

Change-Id: I1b5570d889c20f8a029a5321a290b6807ce6af77
 2016-05-18 15:39:05 +00:00
Philip P. Moltmann
8375604e96 Merge "Handle printers selected by SelectPrinter activity" into nyc-dev am: 746de4e9c8 
am: 0ba575e431

* commit '0ba575e4314b4a7cfc467ee08fa06f1011a44eb5':
  Handle printers selected by SelectPrinter activity

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

* commit '8e5c3a004ae96a542152fc83e4412d44a3452ed5':
  Handle printers selected by SelectPrinter activity

Change-Id: If8eb9a96675f2a549fbd3efa1b6418cc1f1ace0c
 2016-05-18 15:38:55 +00:00
Android Build Merger (Role)
d06f4a56fd Merge "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 am: a663282036" into nyc-mr1-dev-plus-aosp 2016-05-18 15:33:11 +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
e82d94b585 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 
am: a663282036

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

Change-Id: I73fce8632c5e8268114882181d1537708be557a8
 2016-05-18 15:32:45 +00:00
Cheryl Potter
b335d10539 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 
am: 9b9049a373

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

Change-Id: If4779d18b21fea7c028b7dd4cf2d937c5b93c399
 2016-05-18 15:32:19 +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
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
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
Michael Wright
621c5064e0 Merge changes from topic \'bad-attr-buildfix\' into nyc-dev am: 7e91ec88ef 
am: 8b0faef1a2

* commit '8b0faef1a2093e41965d175dc9781d92d57ef5f9':

Change-Id: I7238050eb1a0df58b8f1f715258e65f57d783849
 2016-05-18 15:20:23 +00:00
Michael Wright
9e89ba4406 Merge changes from topic \'bad-attr-buildfix\' into nyc-dev am: 7e91ec88ef 
am: f205245cf4

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

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

* commit '16d3fae49449c8f0411f2cfc8323a86b0c965aa1':

Change-Id: I36667bf0d4f61f59607365c4a6d80817bc2634de
 2016-05-18 15:18:07 +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