Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
254,726 Commits 3 Branches 0 Tags
c0ec8961863354cf60a307558d3ce4aff5f4c440
Commit Graph

254726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
c0ec896186 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 5ac773c8f7  -s ours

* commit '5ac773c8f7a6edef2d72fb9ce1b2fd8a90740978':
  Import translations. DO NOT MERGE

Change-Id: I52f42bcf1cfd40e4c90e17ae15651954d01915e6
 2016-05-18 18:04:49 +00:00
Baligh Uddin
659e607049 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: eb93f0668c  -s ours

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

Change-Id: I0c1c999903a7f1d54c3fa44b26ea77d16a2d59f0
 2016-05-18 18:04:45 +00:00
Baligh Uddin
99687a6400 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 06994e5e8c  -s ours

* commit '06994e5e8c77fea7f16283590656bceffd9d7c11':
  Import translations. DO NOT MERGE

Change-Id: I9f0acc75e5f4300ac1cf3133668531d070b34274
 2016-05-18 18:04:39 +00:00
Baligh Uddin
be3189b6b3 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 123637175e  -s ours

* commit '123637175e0127672a8fa8c52c155abd8dd0dae6':
  Import translations. DO NOT MERGE

Change-Id: Ib14f9450c24ebe600c582b5dbc43fde082d09be3
 2016-05-18 18:04:34 +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
eb93f0668c Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-18 17:57:21 +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
Android Build Merger (Role)
9fb2bbba45 Merge "docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 am: 51136f409f am: 7d9f487457" into nyc-mr1-dev-plus-aosp 2016-05-18 17:46:14 +00:00
Bert McMeen
0ceb54526f docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 am: 51136f409f 
am: 7d9f487457

* commit '7d9f487457f78af3fbf5b0afdf0999b9e3524694':
  docs: Downloads change for 'I' build

Change-Id: I31e044a2fa5adecba058f27868b0352e601457ee
 2016-05-18 17:45:45 +00:00
Bert McMeen
e9b5b203ec docs: Downloads change for \'I\' build am: 90433cf4d8 am: 996c9839d6 am: 51136f409f 
am: 5dfa27c64c

* commit '5dfa27c64c125b2a93ff00e5cf2124d9bcbebe3e':
  docs: Downloads change for 'I' build

Change-Id: Ia2f50d3311ca2543013f6a0f5d3149a13d579a83
 2016-05-18 17:45:40 +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
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
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
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
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