Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
261,999 Commits 3 Branches 0 Tags
d4e70720ef7ada2d5e040dcadd2ba47b87fdead4
Commit Graph

261999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
d4e70720ef Merge "Import translations. DO NOT MERGE" 2016-05-18 17:48:35 +00:00
Baligh Uddin
b1926daaab Merge "Import translations. DO NOT MERGE" 2016-05-18 17:48:32 +00:00
Baligh Uddin
8b5adafff9 Merge "Import translations. DO NOT MERGE" 2016-05-18 17:48:26 +00:00
Sudheer Shanka
1d697775e7 Merge "Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev am: 0d902adbbc am: 6c505ecdd6" into nyc-mr1-dev-plus-aosp 
am: 0353b3e1d1

* commit '0353b3e1d10beb5de059fa7fa679789223c17b18':

Change-Id: I6820ad9fd717012f70ebaa5e3daafa609f88dcab
 2016-05-18 17:23:36 +00:00
Sudheer Shanka
773cbc0da1 Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 am: db9d529499 
am: d412dfc2a8

* commit 'd412dfc2a80166038e8ea17759dfdfc1b03b419d':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: I021b42322aed96471559574aa7d6af63ced784b4
 2016-05-18 17:23:31 +00:00
Tony Mak
f98b9d2c68 Merge "Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 am: 4d4fe58a32" into nyc-mr1-dev-plus-aosp 
am: 59a6ac7daa

* commit '59a6ac7daa54bde4a9fb73578ce1537a7de71f61':

Change-Id: I67c8d60883b38462317fc095c46f517997580d4e
 2016-05-18 17:23:25 +00:00
Android Build Merger (Role)
0353b3e1d1 Merge "Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev am: 0d902adbbc am: 6c505ecdd6" into nyc-mr1-dev-plus-aosp 2016-05-18 17:19:25 +00:00
Tony Mak
ebe5cf225a Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 am: d918a77820 
am: b008d581fc

* commit 'b008d581fc4b3cc6e51e99b4bfeb1d06bef2bea7':
  Should check isDeviceSecure in shouldConfirmCredentials

Change-Id: Id3b0c0d4b1af8a63fb042f8106dc6b2d3926016c
 2016-05-18 17:19:06 +00:00
Sudheer Shanka
8dd7c2697a Merge "Update RestrictedLockUtils to use UM.getUserRestrictionSource." into nyc-dev am: 0d902adbbc 
am: 6c505ecdd6

* commit '6c505ecdd67021cc9ccadef0f20c58661044b22c':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: I219b121976705542a7d6a024119c39d9413381b8
 2016-05-18 17:19:02 +00:00
Tony Mak
d412dfc2a8 Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 
am: db9d529499

* commit 'db9d529499cc635c5ce3d0a4d5b44f2211afaef6':
  Update RestrictedLockUtils to use UM.getUserRestrictionSource.

Change-Id: I12805ef5c1a7039ccad07e31f84231cc703dd470
 2016-05-18 17:18:36 +00:00
Android Build Merger (Role)
59a6ac7daa Merge "Should check isDeviceSecure in shouldConfirmCredentials am: ae13e18c55 am: 4d4fe58a32" into nyc-mr1-dev-plus-aosp 2016-05-18 17:15:37 +00:00
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
TreeHugger Robot
5f231e4d27 Merge "Fix trivial warnings in Tethering.java" 2016-05-18 17:05:17 +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
a9f38d890f Merge "Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev am: 048cabdbcb am: 689b8026ed" into nyc-mr1-dev-plus-aosp 
am: bf8a1a2593

* commit 'bf8a1a25938b6bb86af558dba2cac1a22d034a56':

Change-Id: Id24553e4871e3ae12b20f1e09a4caae5562daa1b
 2016-05-18 16:57:40 +00:00
Mady Mellor
29abe8b728 Merge "Ensure background is shown behind gear when notifications overlap" into nyc-dev am: 048cabdbcb am: 573c36a484 
am: f0b665f6e1

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

Change-Id: I98764977db122c57080f918939e8b2e6c913d8f9
 2016-05-18 16:57:35 +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
Felipe Leme
6c8e2b187c Merge "Merge "Use batching to set firewall rules." into nyc-dev am: e821f3d032 am: ece1932178" into nyc-mr1-dev-plus-aosp 
am: 4fb8d20700

* commit '4fb8d207005c3af0356e3a1e638ff283a4fd4d91':

Change-Id: Iac45a790b3fbc4486c2173c4c751c1f1bd4d22e9
 2016-05-18 16:45:47 +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
f6f2d202c6 Merge "Use batching to set firewall rules." into nyc-dev am: e821f3d032 am: 09e9877dca 
am: e151f0519f

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

Change-Id: I572d12ef571de9bbb0561dbe31edd3c08988e95d
 2016-05-18 16:41:07 +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
TreeHugger Robot
e821f3d032 Merge "Use batching to set firewall rules." into nyc-dev 2016-05-18 16:26:45 +00:00
Jaewan Kim
45b663c80f Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev am: 4e08800a7e am: 7b1e4a02c3 
am: 709741d719

* commit '709741d7198d71744a4632788672f7c48c88af01':

Change-Id: I2fcd2a8c51b043eea56f1d7d3492d8d170f0f710
 2016-05-18 16:01:10 +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
2a1851793b Merge "PIP: Fix NPE when enters Recents with PIP" into nyc-dev am: 4e08800a7e am: e659fac4c2 
am: c1093b1dca

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

Change-Id: Ic74513e1eb7c743e249fadfe6513e782c4afbd59
 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
Robert Sesek
7e2707e11f Merge "Merge "Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE." into nyc-dev am: f45bc095c6 am: a83b4cfc74" into nyc-mr1-dev-plus-aosp 
am: 1deeeba0b3

* commit '1deeeba0b363a2a6ead10073434b283f2dd2070c':

Change-Id: Iae331c06db0d08d0f560a83c58085760bcf6fa2c
 2016-05-18 15:43:24 +00:00
Philip P. Moltmann
cc7af5b88a Merge "Merge "Handle printers selected by SelectPrinter activity" into nyc-dev am: 746de4e9c8 am: 8e5c3a004a" into nyc-mr1-dev-plus-aosp 
am: 0579e6a21d

* commit '0579e6a21d96266ad99bebdd550d543d7a99253f':

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

* commit '4b7f83870be5a0fae07ff7a254b25cf258a24f39':
  Add clarifying documentation to Context.BIND_EXTERNAL_SERVICE.

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

* commit '8375604e9625f176e98bfe1434d9c461d23266e7':
  Handle printers selected by SelectPrinter activity

Change-Id: I98aa51c72caa63af86107bb1ab4afc1bf7c436ca
 2016-05-18 15:43:06 +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