Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
259,836 Commits 3 Branches 0 Tags
dcf3203ca6f9acf0923c19dea17d5e50067df2ce
Commit Graph

259836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
dcf3203ca6 Add a benchmark 
Change-Id: I0238d79372bc4b2d2f265c026d172b37e3e38c0f
 2016-05-12 15:11:51 -07:00
Robert Carr
656e11f5b5 Merge "Merge "Don\'t notify windows of resize during PIP animation." into nyc-dev am: 562ea5ceb5 am: 0fe993b54a" into nyc-mr1-dev-plus-aosp 
am: 7db204118a

* commit '7db204118a619a30138c77ef53533c9132039626':

Change-Id: Ie6e3a00b88b26786f5b47e7cec146fa8af579e7a
 2016-05-12 19:51:20 +00:00
Robert Carr
1df1dec749 Merge "Don\'t notify windows of resize during PIP animation." into nyc-dev am: 562ea5ceb5 am: 7c98d0211f 
am: 57ba8c724b

* commit '57ba8c724b4bbe63fcd30b2bdb15db0f443558ee':
  Don't notify windows of resize during PIP animation.

Change-Id: Iac8cf3e607c02250934b1ec6e35672e04c0e3665
 2016-05-12 19:48:46 +00:00
Scott Main
75dcd752fa Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd am: b4c50e1235 am: e8d16b29c3 am: 37ac352478 
am: 0464cac17c

* commit '0464cac17c96597d3864521930e28b5ed2913705':

Change-Id: Ie56d95579f530f7b59357498dc46a187922841d6
 2016-05-12 19:48:42 +00:00
Android Build Merger (Role)
7db204118a Merge "Merge "Don\'t notify windows of resize during PIP animation." into nyc-dev am: 562ea5ceb5 am: 0fe993b54a" into nyc-mr1-dev-plus-aosp 2016-05-12 19:46:13 +00:00
Robert Carr
33662ab76c Merge "Don\'t notify windows of resize during PIP animation." into nyc-dev am: 562ea5ceb5 
am: 0fe993b54a

* commit '0fe993b54af35b19b8464d5b6ecf561cc666d5f9':
  Don't notify windows of resize during PIP animation.

Change-Id: I44e18d47603edce6173f2a356850103528384cd5
 2016-05-12 19:45:50 +00:00
Robert Carr
57ba8c724b Merge "Don\'t notify windows of resize during PIP animation." into nyc-dev am: 562ea5ceb5 
am: 7c98d0211f

* commit '7c98d0211f802c02f06837497f91b5369e01f0bc':
  Don't notify windows of resize during PIP animation.

Change-Id: I1085a939e785491b1252821a61d01345af5bc88b
 2016-05-12 19:45:46 +00:00
Scott Main
cf3bd00953 Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd am: b4c50e1235 am: e8d16b29c3 am: 103ba00c99 
am: c288c6f149

* commit 'c288c6f149894a97fe6427d94a6bfd374cb61f53':
  update banner to 2.1 and remove yellow

Change-Id: Ia5cbdbb19cbec83470e20d62687889de78968062
 2016-05-12 19:42:43 +00:00
Chad Brubaker
af85a583c3 Merge "Support TrustedCertificateStore.findAllIssuers" am: d58e7b2d15 am: 1e66b26c41 -s ours am: e591bf5c89 
am: 30235a68ea

* commit '30235a68ea5845ebf8fdfdc927002858ec1e15b4':
  Support TrustedCertificateStore.findAllIssuers

Change-Id: Ia11aa649947c3dc53674cadcc9c6e15694353053
 2016-05-12 19:42:38 +00:00
smain@google.com
0464cac17c Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd am: b4c50e1235 am: e8d16b29c3 
am: 37ac352478

* commit '37ac3524788b52d6e0f03d4f3716ce513644057b':

Change-Id: Ie2013ef3f103f579265b43dd2299dd9f6e7f4ad0
 2016-05-12 19:42:28 +00:00
Robert Carr
0fe993b54a Merge "Don\'t notify windows of resize during PIP animation." into nyc-dev 
am: 562ea5ceb5

* commit '562ea5ceb5e10a3ea4dfd3825b2d639fbc6506b0':
  Don't notify windows of resize during PIP animation.

Change-Id: I759b052e5447fe7cd703face366c20e95cdbe6bd
 2016-05-12 19:42:23 +00:00
Robert Carr
7c98d0211f Merge "Don\'t notify windows of resize during PIP animation." into nyc-dev 
am: 562ea5ceb5

* commit '562ea5ceb5e10a3ea4dfd3825b2d639fbc6506b0':
  Don't notify windows of resize during PIP animation.

Change-Id: Ib2c41bf5097755419ceb56aa62982ee5963d7316
 2016-05-12 19:42:21 +00:00
smain@google.com
c288c6f149 Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd am: b4c50e1235 am: e8d16b29c3 
am: 103ba00c99

* commit '103ba00c993b37eb5853179d48389ea5bee36ba5':
  update banner to 2.1 and remove yellow

Change-Id: I92a80c0f5280d2075b0e66e79649ace21e4beeb4
 2016-05-12 19:39:40 +00:00
Chad Brubaker
30235a68ea Merge "Support TrustedCertificateStore.findAllIssuers" am: d58e7b2d15 am: 1e66b26c41 -s ours 
am: e591bf5c89

* commit 'e591bf5c898160f248790e99a911928e01dab5ce':
  Support TrustedCertificateStore.findAllIssuers

Change-Id: I7c0255470808f6629cd72c2aca1f156cb4638589
 2016-05-12 19:38:05 +00:00
Scott Main
37ac352478 Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd am: b4c50e1235 
am: e8d16b29c3

* commit 'e8d16b29c3dda7535d356686383d147193dc677d':
  update banner to 2.1 and remove yellow

Change-Id: I1bda044733d37444e0a8d818aadc26ed858c386e
 2016-05-12 19:37:08 +00:00
Scott Main
103ba00c99 Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd am: b4c50e1235 
am: e8d16b29c3

* commit 'e8d16b29c3dda7535d356686383d147193dc677d':
  update banner to 2.1 and remove yellow

Change-Id: I9dde62e39329d027f6beb1e14814bd882c76b15b
 2016-05-12 19:37:06 +00:00
TreeHugger Robot
562ea5ceb5 Merge "Don't notify windows of resize during PIP animation." into nyc-dev 2016-05-12 19:35:25 +00:00
Chad Brubaker
e591bf5c89 Merge "Support TrustedCertificateStore.findAllIssuers" am: d58e7b2d15 
am: 1e66b26c41  -s ours

* commit '1e66b26c419ec8a73daba7c91c0a3f9ac306c82c':
  Support TrustedCertificateStore.findAllIssuers

Change-Id: Iec0f5e67b84a9659b67d5aaaf19e584d67ccf171
 2016-05-12 19:34:51 +00:00
smain@google.com
e8d16b29c3 Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 am: 55aff78cfd 
am: b4c50e1235

* commit 'b4c50e123542b268ec3ff7ef64514557a1cf3701':
  update banner to 2.1 and remove yellow

Change-Id: I10428534b0b4825e1b03818e682472525d5089a0
 2016-05-12 19:34:30 +00:00
Scott Main
b4c50e1235 Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs am: 7eac6f1289 
am: 55aff78cfd

* commit '55aff78cfd2f60f938eae7f1564d3ccd5c2c9c84':
  update banner to 2.1 and remove yellow

Change-Id: I5aa38003db9207bfc40f353cda6d86070c311520
 2016-05-12 19:31:55 +00:00
smain@google.com
55aff78cfd Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs 
am: 7eac6f1289

* commit '7eac6f1289052a0845de2fb6cd760d0c2d9b5da0':
  update banner to 2.1 and remove yellow

Change-Id: I343bca6044cc7362d9337b7cddc3da2ab3676dc6
 2016-05-12 19:29:20 +00:00
Chad Brubaker
1e66b26c41 Merge "Support TrustedCertificateStore.findAllIssuers" 
am: d58e7b2d15

* commit 'd58e7b2d15f4ca60d96bd0fa5e294c40eea76c14':
  Support TrustedCertificateStore.findAllIssuers

Change-Id: If29fab8118a025b5339b0076eaba43d99bbca04a
 2016-05-12 19:26:47 +00:00
Scott Main
7eac6f1289 Merge "update banner to 2.1 and remove yellow" into mnc-mr-docs 2016-05-12 19:25:09 +00:00
Selim Cinek
28d3e6dd5c Merge "Merge "Fixed a crash when dumping groupmanager" into nyc-dev am: 95b3120d08 am: dc1bc46ea8" into nyc-mr1-dev-plus-aosp 
am: 2f1d9a4125

* commit '2f1d9a412570766b608c0dc71e165e74ef3277c6':

Change-Id: Ic4cd215f092ae415efdaf5282bc66e029d61d863
 2016-05-12 19:24:33 +00:00
Selim Cinek
65423035ca Merge "Merge "Fixed a crash when dumping groupmanager" into nyc-dev am: 95b3120d08 am: dc1bc46ea8" into nyc-mr1-dev-plus-aosp 
am: b7650dcc72

* commit 'b7650dcc729871afa36d0114d1ec86ad81d369aa':

Change-Id: Ie8f1eb549f1caed7843716b8253e1157aee52fab
 2016-05-12 19:24:30 +00:00
smain@google.com
62dfd04dcb update banner to 2.1 and remove yellow 
Change-Id: I27c5e046804bbfb79640fe544ff1f07d777c853d
 2016-05-12 12:23:20 -07:00
Selim Cinek
5f9a0ae10c Merge "Fixed a crash when dumping groupmanager" into nyc-dev am: 95b3120d08 am: 2e0e23b684 
am: d7a22f64c3

* commit 'd7a22f64c37ca93696df1a9577aff4272f2f3222':
  Fixed a crash when dumping groupmanager

Change-Id: I101e64e5dd5cc3fe41f5ec2aa91dcc821e802931
 2016-05-12 19:22:02 +00:00
Android Build Merger (Role)
2f1d9a4125 Merge "Merge "Fixed a crash when dumping groupmanager" into nyc-dev am: 95b3120d08 am: dc1bc46ea8" into nyc-mr1-dev-plus-aosp 2016-05-12 19:21:57 +00:00
Selim Cinek
6045e860a8 Merge "Fixed a crash when dumping groupmanager" into nyc-dev am: 95b3120d08 
am: dc1bc46ea8

* commit 'dc1bc46ea89edeb8c43dc8ca92243d18953b87ad':

Change-Id: I6e7839b634ea75fd178ac306fe09c861e8bcc687
 2016-05-12 19:21:36 +00:00
Android Build Merger (Role)
b7650dcc72 Merge "Merge "Fixed a crash when dumping groupmanager" into nyc-dev am: 95b3120d08 am: dc1bc46ea8" into nyc-mr1-dev-plus-aosp 2016-05-12 19:19:58 +00:00
Selim Cinek
0025841e46 Merge "Fixed a crash when dumping groupmanager" into nyc-dev am: 95b3120d08 
am: dc1bc46ea8

* commit 'dc1bc46ea89edeb8c43dc8ca92243d18953b87ad':
  Fixed a crash when dumping groupmanager

Change-Id: I5c8ac1e87743c75aa69ebdeefd35c0eef7d6a963
 2016-05-12 19:19:29 +00:00
Selim Cinek
d7a22f64c3 Merge "Fixed a crash when dumping groupmanager" into nyc-dev am: 95b3120d08 
am: 2e0e23b684

* commit '2e0e23b68473da94b7d5abda66735e7f1d9f619d':
  Fixed a crash when dumping groupmanager

Change-Id: Ic6e6e07b46c1dc20e16f472982bd3f63e0e03311
 2016-05-12 19:19:26 +00:00
Chad Brubaker
d58e7b2d15 Merge "Support TrustedCertificateStore.findAllIssuers" 2016-05-12 19:18:47 +00:00
Selim Cinek
2e0e23b684 Merge "Fixed a crash when dumping groupmanager" into nyc-dev 
am: 95b3120d08

* commit '95b3120d089ba4e2c8d2c7e4349ef754689ed68f':
  Fixed a crash when dumping groupmanager

Change-Id: I28357779885b1d38acdc4579986293304fa11150
 2016-05-12 19:16:59 +00:00
Selim Cinek
dc1bc46ea8 Merge "Fixed a crash when dumping groupmanager" into nyc-dev 
am: 95b3120d08

* commit '95b3120d089ba4e2c8d2c7e4349ef754689ed68f':
  Fixed a crash when dumping groupmanager

Change-Id: I65eee546cb3bfc3b7f0a841eeb5e1ed333f696b5
 2016-05-12 19:16:57 +00:00
Selim Cinek
95b3120d08 Merge "Fixed a crash when dumping groupmanager" into nyc-dev 2016-05-12 19:09:59 +00:00
Robert Carr
a3bef6b431 Merge "Merge "Fix surfaceInset adjustment." into nyc-dev am: 663330a325 am: 00c4404576" into nyc-mr1-dev-plus-aosp 
am: 85b3e58b0a

* commit '85b3e58b0a42cca437108e9abcf4e75fdbe13acc':

Change-Id: I07719d507ad0ab716d8d878ca767ff447676bd28
 2016-05-12 19:07:17 +00:00
Robert Carr
d1954e723e Merge "Fix surfaceInset adjustment." into nyc-dev am: 663330a325 am: ea84ad75d3 
am: 62be08241f

* commit '62be08241f57ffc9c636b06ff6d83e110725df6d':
  Fix surfaceInset adjustment.

Change-Id: I8f22e2876dd768a1ecf739a883c21f79d787f2b5
 2016-05-12 19:07:13 +00:00
Android Build Merger (Role)
85b3e58b0a Merge "Merge "Fix surfaceInset adjustment." into nyc-dev am: 663330a325 am: 00c4404576" into nyc-mr1-dev-plus-aosp 2016-05-12 19:05:31 +00:00
Robert Carr
034dfe3a4d Merge "Fix surfaceInset adjustment." into nyc-dev am: 663330a325 
am: 00c4404576

* commit '00c4404576124359fd661862aea5d3bf21542d7a':
  Fix surfaceInset adjustment.

Change-Id: Ie473ab1eabd897434b642765bffa46cbba22e2cc
 2016-05-12 19:05:12 +00:00
Robert Carr
62be08241f Merge "Fix surfaceInset adjustment." into nyc-dev am: 663330a325 
am: ea84ad75d3

* commit 'ea84ad75d3e5f9244238c32154cffaab21bda58a':
  Fix surfaceInset adjustment.

Change-Id: I37b96b4a773e9f53bd143fc1f55a9f633794f8b2
 2016-05-12 19:04:32 +00:00
Robert Carr
00c4404576 Merge "Fix surfaceInset adjustment." into nyc-dev 
am: 663330a325

* commit '663330a325c4b324eb19cdb4f83189f342e01060':
  Fix surfaceInset adjustment.

Change-Id: I648b66bc468cb7d9e48126a69ca44af3c9116614
 2016-05-12 19:01:54 +00:00
Robert Carr
ea84ad75d3 Merge "Fix surfaceInset adjustment." into nyc-dev 
am: 663330a325

* commit '663330a325c4b324eb19cdb4f83189f342e01060':
  Fix surfaceInset adjustment.

Change-Id: I9274121cdbd8ea8ed656478b98d6cd4b740834b8
 2016-05-12 19:01:46 +00:00
Andrew Solovay
e9c8557bb5 Merge "Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571 am: dc4cd59183 am: 8363a70024 am: 5e7d6e6daa" into nyc-mr1-dev-plus-aosp 
am: e9715cbca7

* commit 'e9715cbca7f58dd696641efe5b162f820dcc1308':

Change-Id: Ib051ed42300a76a1c8ea2d2b8d051428f5584cc7
 2016-05-12 18:59:28 +00:00
Andrew Solovay
a1f1840c9f Merge "Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571 am: dc4cd59183 am: 8363a70024 am: 5e7d6e6daa" into nyc-mr1-dev-plus-aosp 
am: 1c51080466

* commit '1c510804665910631c83c196611001ffc04df975':

Change-Id: I48d7acf9737cebe64a0060be00b242aed8ed6b76
 2016-05-12 18:59:23 +00:00
TreeHugger Robot
663330a325 Merge "Fix surfaceInset adjustment." into nyc-dev 2016-05-12 18:57:58 +00:00
Andrew Solovay
77ddf7e6a0 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571 am: dc4cd59183 am: 8363a70024 am: e4f6677cbb 
am: 362d107b83

* commit '362d107b8331d426ba1b6971250d6a8fe3e979d1':
  docs: Noted that custom permissions must be unique per-device

Change-Id: I26d5bcc10081b8d59978598c932e2143b15ec6a9
 2016-05-12 18:56:39 +00:00
Android Build Merger (Role)
e9715cbca7 Merge "Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571 am: dc4cd59183 am: 8363a70024 am: 5e7d6e6daa" into nyc-mr1-dev-plus-aosp 2016-05-12 18:56:33 +00:00
Andrew Solovay
d509b4aa58 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571 am: dc4cd59183 am: 8363a70024 
am: 5e7d6e6daa

* commit '5e7d6e6daa7bcf5f937aa224033ef0e372ce74c7':

Change-Id: Ic289cdbf98eb66cc94c4733e8e110560f1d9da91
 2016-05-12 18:56:11 +00:00
Android Build Merger (Role)
1c51080466 Merge "Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571 am: dc4cd59183 am: 8363a70024 am: 5e7d6e6daa" into nyc-mr1-dev-plus-aosp 2016-05-12 18:54:25 +00:00