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

259806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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)
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
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
Andrew Solovay
89ae174d72 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':
  docs: Noted that custom permissions must be unique per-device

Change-Id: I32ea7f6b026a40386ae5bd27d5c4eebda82855a1
 2016-05-12 18:54:01 +00:00
Andrew Solovay
362d107b83 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

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

Change-Id: I98880520c22feb85d9885d48493f86a996dbf751
 2016-05-12 18:53:58 +00:00
Ian Rogers
9ac4734714 Merge "Remove @Nullable from primitive/void types." 2016-05-12 18:53:05 +00:00
Andrew Solovay
e4f6677cbb Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571 am: dc4cd59183 
am: 8363a70024

* commit '8363a70024a53f4934639a1e6c13aae17f4d6d0c':
  docs: Noted that custom permissions must be unique per-device

Change-Id: Ida453b78baa5e40a9d2f9241d34ac5ad172efbcd
 2016-05-12 18:51:30 +00:00
Andrew Solovay
5e7d6e6daa Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571 am: dc4cd59183 
am: 8363a70024

* commit '8363a70024a53f4934639a1e6c13aae17f4d6d0c':
  docs: Noted that custom permissions must be unique per-device

Change-Id: I4efc79802eeb2ecdc72a3cba21862313de1225df
 2016-05-12 18:51:27 +00:00
Andrew Solovay
8363a70024 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 am: 76f95f5571 
am: dc4cd59183

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

Change-Id: Ieaef597484008d63ce1660f89d50c8cd1515f9ed
 2016-05-12 18:48:50 +00:00
Jason Monk
919d566067 Merge "Merge "Update demo mode time" into nyc-dev am: 341e37d349 am: c178881033" into nyc-mr1-dev-plus-aosp 
am: 4f0576d37b

* commit '4f0576d37b36fb7f97148ba6d83ec42e91e01cea':

Change-Id: Iae04c07e4bed5d3c0f918cc74706497f987cd4ac
 2016-05-12 18:46:23 +00:00
Jason Monk
6c2b26c8c0 Merge "Merge "Update demo mode time" into nyc-dev am: 341e37d349 am: c178881033" into nyc-mr1-dev-plus-aosp 
am: e0007e7dd4

* commit 'e0007e7dd4375441401592709182282ce57d0917':

Change-Id: Icb26fb11e0fca8e03f54a7bb0aa92d933002c9c2
 2016-05-12 18:46:21 +00:00
Andrew Solovay
dc4cd59183 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs am: 9be023f077 
am: 76f95f5571

* commit '76f95f557129a583a52b8d7c896510fc3e2e02e8':
  docs: Noted that custom permissions must be unique per-device

Change-Id: I16fb362316afee6e6a4565184ef1c9798e1530be
 2016-05-12 18:46:17 +00:00
Jason Monk
32d7e37b4d Merge "Update demo mode time" into nyc-dev am: 341e37d349 am: 9f3141ebee 
am: 9287a8ec4d

* commit '9287a8ec4d520f7402f1e8d47e7bb8f0dd6ca2fe':
  Update demo mode time

Change-Id: I7acd614d6d224c412e9a0c4514f81688a32d8cef
 2016-05-12 18:43:40 +00:00
Android Build Merger (Role)
4f0576d37b Merge "Merge "Update demo mode time" into nyc-dev am: 341e37d349 am: c178881033" into nyc-mr1-dev-plus-aosp 2016-05-12 18:43:38 +00:00
Andrew Solovay
76f95f5571 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs 
am: 9be023f077

* commit '9be023f0772359137f7b4d933add43de2db1aaa0':
  docs: Noted that custom permissions must be unique per-device

Change-Id: I3af5d87f77b5b40c2c7dd7c099f3c62fe4649d28
 2016-05-12 18:43:34 +00:00
Jason Monk
2163dca7ab Merge "Update demo mode time" into nyc-dev am: 341e37d349 
am: c178881033

* commit 'c1788810335008388cce776c2900329a7c95b93f':

Change-Id: Ia549ec8619e0f23fc5fca68800d3355e4bd00932
 2016-05-12 18:43:12 +00:00
Android Build Merger (Role)
e0007e7dd4 Merge "Merge "Update demo mode time" into nyc-dev am: 341e37d349 am: c178881033" into nyc-mr1-dev-plus-aosp 2016-05-12 18:41:29 +00:00
TreeHugger Robot
9be023f077 Merge "docs: Noted that custom permissions must be unique per-device" into mnc-mr-docs 2016-05-12 18:41:23 +00:00
Jason Monk
34fb6b344b Merge "Update demo mode time" into nyc-dev am: 341e37d349 
am: c178881033

* commit 'c1788810335008388cce776c2900329a7c95b93f':
  Update demo mode time

Change-Id: Ic588583c81170f8c926c867ab86774e5cc639487
 2016-05-12 18:41:05 +00:00
Jason Monk
9287a8ec4d Merge "Update demo mode time" into nyc-dev am: 341e37d349 
am: 9f3141ebee

* commit '9f3141ebee6a1b06ff95532fe9bc9e95ef66c983':
  Update demo mode time

Change-Id: Icbff19b62042d45494dc45dcfe87b4dbfbc98188
 2016-05-12 18:41:02 +00:00
Jason Monk
9f3141ebee Merge "Update demo mode time" into nyc-dev 
am: 341e37d349

* commit '341e37d349b001b87a7d66ea3f6a4b4ffdf4f52a':
  Update demo mode time

Change-Id: I4bc09d1f87754c8ff648b2843219bcd941aee4d8
 2016-05-12 18:38:27 +00:00
Jason Monk
c178881033 Merge "Update demo mode time" into nyc-dev 
am: 341e37d349

* commit '341e37d349b001b87a7d66ea3f6a4b4ffdf4f52a':
  Update demo mode time

Change-Id: Ia64c7c33aeaf66ef48f29362c68319b4abcdfdbd
 2016-05-12 18:38:25 +00:00
Jason Monk
341e37d349 Merge "Update demo mode time" into nyc-dev 2016-05-12 18:34:43 +00:00
Selim Cinek
60ca7879ec Fixed a crash when dumping groupmanager 
Change-Id: Id5ffb9e61c1a17d5bd7d8f58024bf84c0fbb6781
Fixes: 28706404
 2016-05-12 18:26:32 +00:00
Phil Weaver
d51546714f Merge "Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev am: 18e9f13b24 am: b60d029ed2" into nyc-mr1-dev-plus-aosp 
am: c727939672

* commit 'c72793967214c4e4a619156d7d7a4dce2f69a4de':

Change-Id: Ia6dc8b0613a586675c62fb0e285093ac986cc6e5
 2016-05-12 18:17:02 +00:00
Phil Weaver
44ecd8d472 Merge "Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev am: 18e9f13b24 am: b60d029ed2" into nyc-mr1-dev-plus-aosp 
am: 9be24cfd2c

* commit '9be24cfd2c0aa4d32eb6a819add006d4dbf8faf4':

Change-Id: I7c3d94aed8f24b963f40915cca7074ab98c2b144
 2016-05-12 18:17:00 +00:00
Phil Weaver
2d85fd839e Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev am: 18e9f13b24 am: 14a9987d99 
am: a6f2153953

* commit 'a6f2153953876e6b16a0285bde4f35c5e40ceaea':
  Don't disrupt a11y state when user is unlocked.

Change-Id: Id741cc938e24c534f52f9f1ff92045fb08dec3f3
 2016-05-12 18:13:35 +00:00
Android Build Merger (Role)
c727939672 Merge "Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev am: 18e9f13b24 am: b60d029ed2" into nyc-mr1-dev-plus-aosp 2016-05-12 18:13:29 +00:00
Phil Weaver
ddb9b979ba Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev am: 18e9f13b24 
am: b60d029ed2

* commit 'b60d029ed2a8b391a15ad7a0f0aebe6e1681705d':

Change-Id: I7292800c0225e0f7a47857a9a40b5cc3128a540e
 2016-05-12 18:13:06 +00:00
Android Build Merger (Role)
9be24cfd2c Merge "Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev am: 18e9f13b24 am: b60d029ed2" into nyc-mr1-dev-plus-aosp 2016-05-12 18:11:10 +00:00
Phil Weaver
f47e53a922 Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev am: 18e9f13b24 
am: b60d029ed2

* commit 'b60d029ed2a8b391a15ad7a0f0aebe6e1681705d':
  Don't disrupt a11y state when user is unlocked.

Change-Id: Id41f5d7443318bf434fc8d1f2d675ef25d67ed1d
 2016-05-12 18:10:36 +00:00