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

249182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Schmidt
5ca058d38e Merge "docs: Updates to GIFs on WH home page" into mnc-io-docs 2016-05-18 19:18:51 +00:00
Bert McMeen
57b9e7da79 Merge "docs: Voice transcription - addition of known issue" into mnc-io-docs am: 6c5d5320e4 am: df502ca47d 
am: 19397a4492

* commit '19397a4492c250eff92a2a705a2799aff8dba173':
  docs: Voice transcription - addition of known issue

Change-Id: I7748a296ff51b6e2bce1decfe0c734b4d3f98cef
 2016-05-18 19:11:57 +00:00
Bert McMeen
19397a4492 Merge "docs: Voice transcription - addition of known issue" into mnc-io-docs am: 6c5d5320e4 
am: df502ca47d

* commit 'df502ca47d3a169bd7959fb3dc6c1da4aba76f53':
  docs: Voice transcription - addition of known issue

Change-Id: I3322e6fa5125f51cc0ea1684b2b49258836e50e1
 2016-05-18 19:07:28 +00:00
Ruben Brunk
755b72be0f Merge "Update VrListener location permission." into nyc-dev 
am: 403970c3ce

* commit '403970c3ce8fe76b34ff966c43e3e11debeef582':
  Update VrListener location permission.

Change-Id: I5299f2e0962ec67f6bf33ea9c92cc1f2ce7c545c
 2016-05-18 19:07:21 +00:00
Baligh Uddin
a0ccbadb8e Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: aebe22dbc3  -s ours

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

Change-Id: I41ff4f7082929c56103d903cf417e9fb306d6639
 2016-05-18 19:07:17 +00:00
Jeff Sharkey
9208ed4c91 Merge "Check processName when starting providers." into nyc-dev 
am: 6bd012a799

* commit '6bd012a799f1dfd3d40dc3d581d18fb36618f0b1':
  Check processName when starting providers.

Change-Id: Ib0a3ab03edee04b9571de37b3e800f434f2c7244
 2016-05-18 19:01:50 +00:00
Bert McMeen
df502ca47d Merge "docs: Voice transcription - addition of known issue" into mnc-io-docs 
am: 6c5d5320e4

* commit '6c5d5320e47bb7b52072e39e928a80573c27abd5':
  docs: Voice transcription - addition of known issue

Change-Id: If9787e5acd50dd451b015305aa3ba7d3f82b5dc3
 2016-05-18 19:01:16 +00:00
Ruben Brunk
403970c3ce Merge "Update VrListener location permission." into nyc-dev 2016-05-18 18:57:09 +00:00
Bert McMeen
6c5d5320e4 Merge "docs: Voice transcription - addition of known issue" into mnc-io-docs 2016-05-18 18:57:03 +00:00
Baligh Uddin
aebe22dbc3 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-18 18:56:45 +00:00
Jeff Sharkey
6bd012a799 Merge "Check processName when starting providers." into nyc-dev 2016-05-18 18:52:03 +00:00
Amith Yamasani
3603bc6e3f Fix a deadlock in system server 
Don't call into DPMS with PackageManager lock held. Doh!

Bug: 28828415
Change-Id: I08437d849236374acc0d804fe31aba703af385ba
 2016-05-18 11:51:09 -07:00
Eric Schmidt
90e0b3da6f docs: Updates to GIFs on WH home page 
Bug: 28317418
Change-Id: I848dd7fa8c9c17681c514dc4ef10ccb9133e4200
 2016-05-18 11:45:30 -07:00
Bert McMeen
6ce1f8942e docs: Voice transcription - addition of known issue 
Bug: 28836448
Change-Id: Ie5df3860d85ab357ec133142c5a4a58eba02d9fa
 2016-05-18 11:43:36 -07:00
Michael Wright
dd20df439c 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: I34b75a84a16312a69b9b2fe9d0d649dbb9df4d72
 2016-05-18 18:42:24 +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
a53a5f6e9e docs: Quick release-notes fix am: 29329dd3f1 am: 1f279c1ab0 
am: eddf9bfc36

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

Change-Id: Iaaef3be1eb2082312f9f62de562876fae45c0ad3
 2016-05-18 18:17:10 +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
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
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