Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android Build Merger (Role)
ad63ea9962 Merge "Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a am: fc536cb862" into nyc-mr1-dev-plus-aosp 2016-06-01 23:17:03 +00:00
Android Build Merger (Role)
d73289e7ac Merge "Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4 am: 20340d0fc8" into nyc-mr1-dev-plus-aosp 2016-06-01 23:16:53 +00:00
Android Build Merger (Role)
4321845b8d Merge "Merge "Fix clipRect transform rounding errors" into nyc-dev am: 2957d9d604 am: 0c63355719" into nyc-mr1-dev-plus-aosp 2016-06-01 23:16:45 +00:00
Android Build Merger (Role)
be28ebecb1 Merge "Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am: 7fe19060cf am: 815c681f42" into nyc-mr1-dev-plus-aosp 2016-06-01 23:16:37 +00:00
Sreevani Sreejith
707c43c6fe Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am: 2d6015b18b am: 441209abc7 am: 82c9562d3c 
am: 9fc3d3deeb

* commit '9fc3d3deeb19111bb42a5454a8c8c24a2df9d9fe':
  docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.

Change-Id: If9c9d88e386d6ba09bf915af77808c3202656483
 2016-06-01 23:15:59 +00:00
David Sehr
4fa0e17183 Merge "Installer connection support for dump_profiles" into nyc-dev am: 7c5bcfc21a 
am: fc536cb862

* commit 'fc536cb862c67d91eaa7fa94557cdc2f0f415678':
  Installer connection support for dump_profiles

Change-Id: I6f8dbd362f6accc2d90409b91e96efed531820d9
 2016-06-01 23:15:53 +00:00
Jeff Sharkey
c9c4fe2af9 Merge "Release AssetManagers when ejecting storage." into nyc-dev am: 380f3b12a4 
am: 20340d0fc8

* commit '20340d0fc82bccf883898e9523f3c8aca8c9ac04':
  Release AssetManagers when ejecting storage.

Change-Id: I8053660edc7088f26c94fb2a3174a743a8d60636
 2016-06-01 23:15:49 +00:00
Chia-I Wu
7e56ed805c Merge "Fix clipRect transform rounding errors" into nyc-dev am: 2957d9d604 
am: 0c63355719

* commit '0c63355719d45986b3ce24046a0338f26a00cf3b':
  Fix clipRect transform rounding errors

Change-Id: I3c24c9407c053c8b764989bb8b6e7352a758b3c2
 2016-06-01 23:15:44 +00:00
Alex Klyubin
af53ef2308 Merge "Use correct cert chain from PKCS#7 SignedData block." into nyc-dev am: 7fe19060cf 
am: 815c681f42

* commit '815c681f4243486693830929bf1be472ae1f467b':
  Use correct cert chain from PKCS#7 SignedData block.

Change-Id: I01cb9b5f0fb409d5f03120b6cdfca9077b7bceb2
 2016-06-01 23:15:40 +00:00
TreeHugger Robot
9bdf289f0a Merge "Skip cancelling jobs with FLAG_WILL_BE_FOREGROUND." into nyc-dev 2016-06-01 23:15:20 +00:00
Android Build Merger (Role)
713a07c3bd Merge "Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a89f am: f2f7bc0454" into nyc-mr1-dev-plus-aosp 2016-06-01 23:15:07 +00:00
Android Build Merger (Role)
11ac61453f Merge "Merge "Show crash/ANR dialogs on userdebug watch builds" into nyc-mr1-dev am: d7b9669b54" into nyc-mr1-dev-plus-aosp 2016-06-01 23:14:56 +00:00
Android Build Merger (Role)
97cbc0ad3b Merge "Merge "Fix DirectReply bug when reapply fails" into nyc-dev am: 6510bdeada am: 06a49b1e93" into nyc-mr1-dev-plus-aosp 2016-06-01 23:14:46 +00:00
Android Build Merger (Role)
94d9bdb86d Merge "Merge "Introduce ButtonInterface and getHomeId()" into nyc-mr1-dev am: 54c3213304" into nyc-mr1-dev-plus-aosp 2016-06-01 23:14:33 +00:00
Android Build Merger (Role)
93e2672d63 Merge "Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973ba9 am: 2ae97b4cf2" into nyc-mr1-dev-plus-aosp 2016-06-01 23:14:21 +00:00
Android Build Merger (Role)
2ec07c96ef Merge "Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a89f am: e24e9a0333" into nyc-mr1-dev-plus-aosp 2016-06-01 23:14:14 +00:00
Annie Chin
a48f9cb72f Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev 2016-06-01 23:14:06 +00:00
Android Build Merger (Role)
b07aac4e95 Merge "Merge "Fix DirectReply bug when reapply fails" into nyc-dev am: 6510bdeada am: 053ffa6d7c" into nyc-mr1-dev-plus-aosp 2016-06-01 23:14:00 +00:00
Android Build Merger (Role)
38827a2eee Merge "Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev am: 61721ee3d7 am: 7aaeb394a9" into nyc-mr1-dev-plus-aosp 2016-06-01 23:13:52 +00:00
Android Build Merger (Role)
4f01d2390f Merge "Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973ba9 am: 47797a7653" into nyc-mr1-dev-plus-aosp 2016-06-01 23:13:45 +00:00
Android Build Merger (Role)
1267b551f1 Merge "Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev am: 61721ee3d7 am: 56b70d51f4" into nyc-mr1-dev-plus-aosp 2016-06-01 23:13:35 +00:00
Android Build Merger (Role)
fd2cbd6282 Merge "Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am: 3e05055af7 am: 6f2181f251" into nyc-mr1-dev-plus-aosp 2016-06-01 23:13:27 +00:00
Android Build Merger (Role)
2726da7c96 Merge "Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am: 3e05055af7 am: 0acb155338" into nyc-mr1-dev-plus-aosp 2016-06-01 23:13:23 +00:00
Android Build Merger (Role)
db369d5426 Merge "Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev am: 42621023cf am: 4f2264ed9d" into nyc-mr1-dev-plus-aosp 2016-06-01 23:13:00 +00:00
Julia Reynolds
16f0bc78f0 Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a89f 
am: e24e9a0333

* commit 'e24e9a033308d33da0f2517bb4e7b0bbade7efe2':
  Only call finish on operations that have started.

Change-Id: I3679e6e9fb68fe804b4ff645d0fbe4e0b3aff29a
 2016-06-01 23:12:27 +00:00
Adrian Roos
7e20f60534 Merge "Fix DirectReply bug when reapply fails" into nyc-dev am: 6510bdeada 
am: 053ffa6d7c

* commit '053ffa6d7c897215fecc4fa85be50f2e82a39640':
  Fix DirectReply bug when reapply fails

Change-Id: I2e415fef0edb01944be4dfdc6f0067fa9e2ead5f
 2016-06-01 23:12:21 +00:00
Chong Zhang
ac63799c1d Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973ba9 
am: 47797a7653

* commit '47797a765327af3d3688b6993d85e727ddcf4aa0':
  Do not sanitize override config for fullscreen

Change-Id: Ib531f36a2526d4d7b2f3c09ece16ca0bb745447f
 2016-06-01 23:12:17 +00:00
Dianne Hackborn
727da2b880 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev am: 61721ee3d7 
am: 56b70d51f4

* commit '56b70d51f45ecf101222d90a993f6f6da044ae65':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: Ib1eeb21537446f7c7b7b99f30acf8713f07dd57f
 2016-06-01 23:12:13 +00:00
Dianne Hackborn
0f94bf9b27 Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am: 3e05055af7 
am: 0acb155338

* commit '0acb155338f8eec7f15069e5133519a6ad31a00f':
  Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Change-Id: I74edc775e4fce077a7d4a933d6c025b9398db5fb
 2016-06-01 23:12:07 +00:00
Julia Reynolds
107a60144d Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a89f 
am: f2f7bc0454

* commit 'f2f7bc04543240bd23707b95b723e85fa85aa037':
  Only call finish on operations that have started.

Change-Id: Idf7f1411cb70eba191748db3a3389062fe1d4baf
 2016-06-01 23:11:53 +00:00
Erik Wolsheimer
073879caf1 Merge "Show crash/ANR dialogs on userdebug watch builds" into nyc-mr1-dev 
am: d7b9669b54

* commit 'd7b9669b5421ae3718afd3d7c1b1dfa59537fb08':
  Show crash/ANR dialogs on userdebug watch builds

Change-Id: I74d48e3c6df115d6c2e94d3e4924a17bee6edc66
 2016-06-01 23:11:46 +00:00
Adrian Roos
2ba641667c Merge "Fix DirectReply bug when reapply fails" into nyc-dev am: 6510bdeada 
am: 06a49b1e93

* commit '06a49b1e931a76503836a437d27138fa3cee20d0':
  Fix DirectReply bug when reapply fails

Change-Id: Ib8f15ecea44c1a896c3fe3237a8c015161cceeea
 2016-06-01 23:11:38 +00:00
Annie Chin
e3c41b81f9 Merge "Introduce ButtonInterface and getHomeId()" into nyc-mr1-dev 
am: 54c3213304

* commit '54c321330404857535a28cba6a5beaacb79c7617':
  Introduce ButtonInterface and getHomeId()

Change-Id: Ib6ca0123400b40aa120462977e08911e2fac7522
 2016-06-01 23:10:04 +00:00
Selim Cinek
d1c8257832 Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev am: 42621023cf 
am: 7b7b17ab80

* commit '7b7b17ab804b81b9dac709012e2e40aa128430ec':
  Fixes a few bugs on the keyguard with font density changes

Change-Id: Ief94128ae895fdfadb4aab3ea1d03f12a4257d7f
 2016-06-01 23:09:53 +00:00
Felipe Leme
602ef2392e Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a 
am: 9a1dfc9dab

* commit '9a1dfc9dabdb69a2100448af43a72a02eeee411e':

Change-Id: Id84838ce714853f1ac200c11bae2f994a0ac1459
 2016-06-01 23:09:47 +00:00
Chong Zhang
45e921f5d2 Merge "Do not sanitize override config for fullscreen" into nyc-dev am: 65f1973ba9 
am: 2ae97b4cf2

* commit '2ae97b4cf23736f3e8796dd5dadaaf666af76841':
  Do not sanitize override config for fullscreen

Change-Id: I68c9388de4a43e8ae03f057b26e0a8caab48afa6
 2016-06-01 23:09:45 +00:00
Jorim Jaggi
5e8beaf6df Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2 
am: a036c209db

* commit 'a036c209db568bb0e0a962f58e1edb0cb628f09d':

Change-Id: I99a1ca15d0df084bfbed8c95bf322e48e59f532e
 2016-06-01 23:09:38 +00:00
Eric Schmidt
546c12cd58 Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a am: 28ed18877b 
am: 7ed7f324f6

* commit '7ed7f324f69712175f8ede8d2504fa28269f0060':

Change-Id: Ida1d4582b66e65ccfdd644bec14153f2735871c2
 2016-06-01 23:09:29 +00:00
Adrian Roos
918739c356 Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650cf 
am: 2bad55cb1b

* commit '2bad55cb1b90a0154a32f4fecf75fe14fd9e8744':

Change-Id: Ia127442c7441efdbcbde2065fbd87ecc75263246
 2016-06-01 23:09:18 +00:00
Dianne Hackborn
4dbb79b919 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev am: 61721ee3d7 
am: 7aaeb394a9

* commit '7aaeb394a92688bc1578ca8e71a470ecd35b3903':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: I6b9333d374af8815c27db4c927c5b8442d2949c9
 2016-06-01 23:06:20 +00:00
Dianne Hackborn
178507d243 Merge "Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController" into nyc-dev am: 3e05055af7 
am: 6f2181f251

* commit '6f2181f251cd6377ef438f9d9c832caf2d251882':
  Fix issue #29069028 NYC: device boot failure: NPE in AppIdleController

Change-Id: I18cfcd873ae2cdf7b844c6f785edf1eb180d2ec0
 2016-06-01 23:06:15 +00:00
Selim Cinek
897ae8d9a4 Merge "Fixes a few bugs on the keyguard with font density changes" into nyc-dev am: 42621023cf 
am: 4f2264ed9d

* commit '4f2264ed9d781681e09a0edffa089edc905e4340':
  Fixes a few bugs on the keyguard with font density changes

Change-Id: I50b0addaa7dbb0e77cbe0a08b93e47e71c515386
 2016-06-01 23:06:10 +00:00
Android Build Merger (Role)
e875210a2c Merge "Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a am: d116e0fc14" into nyc-mr1-dev-plus-aosp 2016-06-01 23:05:15 +00:00
Android Build Merger (Role)
1c943786eb Merge "Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2 am: 859465c105" into nyc-mr1-dev-plus-aosp 2016-06-01 23:05:06 +00:00
Android Build Merger (Role)
8ee81d525e Merge "Merge "docs: Fixed \'MessageStyle\' typo" into mnc-io-docs am: 8ef79a9246 am: 51500a1c5a am: 28ed18877b am: 65436b097a" into nyc-mr1-dev-plus-aosp 2016-06-01 23:04:57 +00:00
sreevanis
9fc3d3deeb Merge "docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference." into mnc-io-docs am: 2d6015b18b am: 441209abc7 
am: 82c9562d3c

* commit '82c9562d3c35df6569fcb04e7cd999fdc11d5d99':
  docs: Fixed setAllowGeneratedReplies() link to point to Android N API reference.

Change-Id: Iedcb96181b7a4e6a7b6ac94eb73bcb466ae19139
 2016-06-01 23:04:35 +00:00
David Sehr
fc536cb862 Merge "Installer connection support for dump_profiles" into nyc-dev 
am: 7c5bcfc21a

* commit '7c5bcfc21ac87c56c57b1929ce04481fa0e116c7':
  Installer connection support for dump_profiles

Change-Id: I4085587ad80b04bc99efbe51c4480f193186a872
 2016-06-01 23:04:25 +00:00
Android Build Merger (Role)
0eb85b9d7c Merge "Merge "AppError: Change "close" to "close app"" into nyc-dev am: b4cd4650cf am: 62eb79e6c8" into nyc-mr1-dev-plus-aosp 2016-06-01 23:04:24 +00:00
Android Build Merger (Role)
5735a69ac3 Merge "cherry-pick: docs: Added note that <application> at end of manifest. am: d5368b8185 am: f5250c5b37 am: b04f86acae am: 8b1df8f382" into nyc-mr1-dev-plus-aosp 2016-06-01 23:04:09 +00:00
Jeff Sharkey
20340d0fc8 Merge "Release AssetManagers when ejecting storage." into nyc-dev 
am: 380f3b12a4

* commit '380f3b12a4725a0534d62ada7c6f3bd67ebd0d01':
  Release AssetManagers when ejecting storage.

Change-Id: I92c0fcbe38dd242cb8a0a3792381de81a7c0384c
 2016-06-01 23:04:09 +00:00