Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Palatin
1ceb78302d Merge "Fix notifications for USB PD enabled devices" into nyc-dev am: 73722c4b0c 
am: 9c3086ceff

* commit '9c3086ceffebcb74560c9651710976eda893b1f0':
  Fix notifications for USB PD enabled devices

Change-Id: I53f1b392cbc80c4e1db2017dade8015ea216986a
 2016-05-20 18:48:27 +00:00
Vincent Palatin
59c27e95a1 Merge "Fix notifications for USB PD enabled devices" into nyc-dev 
am: 73722c4b0c

* commit '73722c4b0cdd3aea12f67b3822244dc3b4aa4387':
  Fix notifications for USB PD enabled devices

Change-Id: I77b56a1811cc3b7580bfe3ebae295c05b0b6918e
 2016-05-20 18:44:42 +00:00
Vincent Palatin
9c3086ceff Merge "Fix notifications for USB PD enabled devices" into nyc-dev 
am: 73722c4b0c

* commit '73722c4b0cdd3aea12f67b3822244dc3b4aa4387':
  Fix notifications for USB PD enabled devices

Change-Id: I9944f705b6a2de59216c2f81613a53546c5f1b50
 2016-05-20 18:44:41 +00:00
Jason Monk
61d118d650 QS: Fix RTL animation 
Change-Id: I9de6e0891fa98ec2212abe28fa942779aa224056
Fixes: 28674500
 2016-05-20 14:44:16 -04:00
TreeHugger Robot
73722c4b0c Merge "Fix notifications for USB PD enabled devices" into nyc-dev 2016-05-20 18:32:10 +00:00
Chris Wren
66619a2ea1 Never fetch notification badges for USER_SYSTEM 
This user never gets a badge, and secondary users will
see a security exception attempting to fetch it for
USER_ALL notifications, such as USB and battery state,
which are posted by USER_SYSTEM.

Bug: 28743335
Change-Id: I65aeb1cf2192811055f8cd94df0b7e292c5c1acf
 2016-05-20 14:24:55 -04:00
Android Build Merger (Role)
15b0a456be Merge "Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c am: 214ebfb532" into nyc-mr1-dev-plus-aosp 2016-05-20 18:03:04 +00:00
Siyamed Sinir
bc13415ef4 Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c 
am: 214ebfb532

* commit '214ebfb5323d0339b34343b04323e26e650e521a':
  setTransformationMethod should reset mTextDir

Change-Id: Ia717c63a312a0cd5729fd1038c7f53313b9b848d
 2016-05-20 18:02:41 +00:00
Siyamed Sinir
68d3077e9a Merge "setTransformationMethod should reset mTextDir" into nyc-dev am: df9dee869c 
am: 8ae06f6f3a

* commit '8ae06f6f3a4fa787ddab9859bc680e63b38686aa':
  setTransformationMethod should reset mTextDir

Change-Id: Ib0c29292f24c049acb3c61baf68ae3df970610c1
 2016-05-20 18:02:39 +00:00
Seigo Nonaka
bd5cac67b8 Clear locales without changing layout direction. 
Calling Configuration.setLocales with emtpy LocaleList may change the
layout direction to LTR. To clear the locales in Configuration without
layout direction change, introduce hidden API to Configuration.

Bug: 28695661
Change-Id: I47c339dffb83099bd329ddb60237dab27b05f593
 2016-05-20 17:59:35 +00:00
Siyamed Sinir
8ae06f6f3a Merge "setTransformationMethod should reset mTextDir" into nyc-dev 
am: df9dee869c

* commit 'df9dee869c9efa18619b28691c88415b4f115df7':
  setTransformationMethod should reset mTextDir

Change-Id: I47699dc6e8c8fdddd91db2c4590a5244403c5f5c
 2016-05-20 17:53:50 +00:00
Siyamed Sinir
214ebfb532 Merge "setTransformationMethod should reset mTextDir" into nyc-dev 
am: df9dee869c

* commit 'df9dee869c9efa18619b28691c88415b4f115df7':
  setTransformationMethod should reset mTextDir

Change-Id: I17d4dc951f840dcfc1e76ed6e9d6b02150495bf9
 2016-05-20 17:53:44 +00:00
Android Build Merger (Role)
c6df6628ef Merge "Merge "Don\'t remove existing EAP configurations" into nyc-dev am: c7ad1ac712 am: bced7c5fb6" into nyc-mr1-dev-plus-aosp 2016-05-20 17:50:10 +00:00
Paul Stewart
c00e3fbf50 Merge "Don\'t remove existing EAP configurations" into nyc-dev am: c7ad1ac712 
am: bced7c5fb6

* commit 'bced7c5fb691d6e45a2ecb6c9c5a0e550e2abdd1':
  Don't remove existing EAP configurations

Change-Id: Ic14d6c57c5736bfbef22f27f77fee08a7ee39913
 2016-05-20 17:49:47 +00:00
Paul Stewart
131b976fe4 Merge "Don\'t remove existing EAP configurations" into nyc-dev am: c7ad1ac712 
am: 7ca542fa99

* commit '7ca542fa99362f15da8d3f57b4916d87c1f67eb3':
  Don't remove existing EAP configurations

Change-Id: I9808325df8d34bb2d08f99b384ff5ad07b6a2273
 2016-05-20 17:49:10 +00:00
Siyamed Sinir
df9dee869c Merge "setTransformationMethod should reset mTextDir" into nyc-dev 2016-05-20 17:46:27 +00:00
Paul Stewart
bced7c5fb6 Merge "Don\'t remove existing EAP configurations" into nyc-dev 
am: c7ad1ac712

* commit 'c7ad1ac712f09c5bc116c66a54a860000b53fa38':
  Don't remove existing EAP configurations

Change-Id: I2678831ad384368a322af859aeadc42fcd2aeda7
 2016-05-20 17:45:21 +00:00
Paul Stewart
7ca542fa99 Merge "Don\'t remove existing EAP configurations" into nyc-dev 
am: c7ad1ac712

* commit 'c7ad1ac712f09c5bc116c66a54a860000b53fa38':
  Don't remove existing EAP configurations

Change-Id: I743d4b0291b7d0c864d30cb04acd7811428419d0
 2016-05-20 17:45:20 +00:00
Paul Stewart
c7ad1ac712 Merge "Don't remove existing EAP configurations" into nyc-dev 2016-05-20 17:39:44 +00:00
Adam Lesinski
bc9e59d1a7 Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 
am: fea0c3af7a

* commit 'fea0c3af7abeec54f47292698e16a556f653bbc0':

Change-Id: Ie8244da32f0ca32077d98d627e3e5a967a810395
 2016-05-20 17:38:00 +00:00
Jeff Sharkey
d21cad13a6 API council feedback: hide and document. 
Hide isMetered() and clarify moveDatabaseFrom() docs.

Bug: 28870582, 28775585
Change-Id: Iabe63045c39ce7f662488f4224b56387c3c59519
 2016-05-20 11:34:55 -06:00
Android Build Merger (Role)
768542e38d Merge "Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 am: 7dd96663a0" into nyc-mr1-dev-plus-aosp 2016-05-20 17:32:45 +00:00
Adam Lesinski
fea0c3af7a Merge "Fix parsing of kernel wakelocks" into nyc-dev 
am: 6f0d399214

* commit '6f0d3992149aa782450667ed750fe0c3cf8ee334':
  Fix parsing of kernel wakelocks

Change-Id: Ibc60849809b5553e820833437a9d2d47d065a38e
 2016-05-20 17:32:42 +00:00
Android Build Merger (Role)
9f981621b2 Merge "Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev am: a781232656 am: 117c975fe2" into nyc-mr1-dev-plus-aosp 2016-05-20 17:32:33 +00:00
Adam Lesinski
acb5ac77a3 Merge "Fix parsing of kernel wakelocks" into nyc-dev am: 6f0d399214 
am: 7dd96663a0

* commit '7dd96663a0c728b4913ed4146cc442336833a1ca':
  Fix parsing of kernel wakelocks

Change-Id: I312c22fdbee545a2f7991c320ee4d5eea73decba
 2016-05-20 17:32:04 +00:00
Wale Ogunwale
97e9d8e9df Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev am: a781232656 
am: 6c7ea25a2b

* commit '6c7ea25a2b3f219dd3fe540fd97ee10ac5f2d77d':
  Put launch adjacent activity in a new task if the activity does exist

Change-Id: I45083d8f83d59ab12d30c171707cc091afe0bfa9
 2016-05-20 17:31:58 +00:00
Wale Ogunwale
405dcc8d2b Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev am: a781232656 
am: 117c975fe2

* commit '117c975fe2e36654ba12b8209bbf3b1bf8b71e71':
  Put launch adjacent activity in a new task if the activity does exist

Change-Id: Ic217c799ee4315df2c716bf42d5dc31ccc26888f
 2016-05-20 17:31:53 +00:00
Adam Lesinski
7dd96663a0 Merge "Fix parsing of kernel wakelocks" into nyc-dev 
am: 6f0d399214

* commit '6f0d3992149aa782450667ed750fe0c3cf8ee334':
  Fix parsing of kernel wakelocks

Change-Id: I8627d87ce84e9c03407a8e5be353aa44635a7712
 2016-05-20 17:27:23 +00:00
Wale Ogunwale
6c7ea25a2b Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev 
am: a781232656

* commit 'a78123265658380b3968773a5f575b0ba1b4620e':
  Put launch adjacent activity in a new task if the activity does exist

Change-Id: I3f08450d7cbb248467ba34e3a28c2b1225b92d31
 2016-05-20 17:24:15 +00:00
Wale Ogunwale
117c975fe2 Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev 
am: a781232656

* commit 'a78123265658380b3968773a5f575b0ba1b4620e':
  Put launch adjacent activity in a new task if the activity does exist

Change-Id: I128ecd96abb81d2ae6a055bace315a8e69a17ac9
 2016-05-20 17:24:06 +00:00
Adam Lesinski
6f0d399214 Merge "Fix parsing of kernel wakelocks" into nyc-dev 2016-05-20 17:23:08 +00:00
Android Build Merger (Role)
5077e755f3 Merge "Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 am: d33151bf4f" into nyc-mr1-dev-plus-aosp 2016-05-20 17:16:59 +00:00
Chris Tate
cd8db38773 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 
am: d33151bf4f

* commit 'd33151bf4fe0da6b64abb995deedaa6622560545':
  Back up / restore the 'mono audio' setting

Change-Id: I51abe2a24d8682792479102e555dd4bc3c1922b9
 2016-05-20 17:16:26 +00:00
Chris Tate
1500a27af2 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev am: a3aaa5ee25 
am: 36b03ec9f0

* commit '36b03ec9f0cd6466f2bd9517a72438e446033685':
  Back up / restore the 'mono audio' setting

Change-Id: I0947760de027c0dfa1fd5f66ea7adfcae9d965a0
 2016-05-20 17:16:25 +00:00
TreeHugger Robot
a781232656 Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev 2016-05-20 17:15:59 +00:00
Christopher Tate
d33151bf4f Merge "Back up / restore the \'mono audio\' setting" into nyc-dev 
am: a3aaa5ee25

* commit 'a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14':
  Back up / restore the 'mono audio' setting

Change-Id: Ieb242d2d382218b6090acf0e72c33c865fb0994b
 2016-05-20 17:11:10 +00:00
Christopher Tate
36b03ec9f0 Merge "Back up / restore the \'mono audio\' setting" into nyc-dev 
am: a3aaa5ee25

* commit 'a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14':
  Back up / restore the 'mono audio' setting

Change-Id: Ie20918c1a8306342de7a5e2201d3e55fff39500c
 2016-05-20 17:11:07 +00:00
Android Build Merger (Role)
d9e68cb9af Merge "Merge "Nav bar: fix tablet density change issues" into nyc-dev am: 6c2bc3db95 am: 80b7ccb67a" into nyc-mr1-dev-plus-aosp 2016-05-20 17:07:57 +00:00
Jason Monk
db8709c1ee Merge "Nav bar: fix tablet density change issues" into nyc-dev am: 6c2bc3db95 
am: 80b7ccb67a

* commit '80b7ccb67a630f982ca9ba7e742dab4f85e6e741':
  Nav bar: fix tablet density change issues

Change-Id: I32bd76024b07abbaf437c12d8b2a443d743a5969
 2016-05-20 17:07:33 +00:00
Jason Monk
a0502fc6ff Merge "Nav bar: fix tablet density change issues" into nyc-dev am: 6c2bc3db95 
am: 9734c229d9

* commit '9734c229d9e403a4d8de784e7919277e0255b455':
  Nav bar: fix tablet density change issues

Change-Id: Idf7058dbd087419cb9c441f3ebdc1c5d13b46bc1
 2016-05-20 17:06:12 +00:00
Chris Tate
a3aaa5ee25 Merge "Back up / restore the 'mono audio' setting" into nyc-dev 2016-05-20 17:05:39 +00:00
Android Build Merger (Role)
d524238c5b Merge "Only broadcast screenshot error to the current user. am: 538c22630b am: e1a14b98a8" into nyc-mr1-dev-plus-aosp 2016-05-20 17:01:36 +00:00
Winson
592b3c24b0 Only broadcast screenshot error to the current user. am: 538c22630b 
am: e1a14b98a8

* commit 'e1a14b98a8e2e57f8ba1983aba5850da24f83e68':
  Only broadcast screenshot error to the current user.

Change-Id: Ia05890764f36997e069815f650ec0ecf7729cf3e
 2016-05-20 17:01:07 +00:00
Jason Monk
9734c229d9 Merge "Nav bar: fix tablet density change issues" into nyc-dev 
am: 6c2bc3db95

* commit '6c2bc3db95dde4e4dff9d04266c3b87c8a6af306':
  Nav bar: fix tablet density change issues

Change-Id: I1a78b8cc86c3fef24cdddbd07c0dfafb61bca471
 2016-05-20 17:00:39 +00:00
Jason Monk
80b7ccb67a Merge "Nav bar: fix tablet density change issues" into nyc-dev 
am: 6c2bc3db95

* commit '6c2bc3db95dde4e4dff9d04266c3b87c8a6af306':
  Nav bar: fix tablet density change issues

Change-Id: I8119bffab2e66535b3eec7f0ce2c5ef990bebfea
 2016-05-20 17:00:33 +00:00
Winson
e1953aff43 Only broadcast screenshot error to the current user. am: 538c22630b 
am: 6e95485f50

* commit '6e95485f502d342e03b93cc0fd34c00c70b86ac7':
  Only broadcast screenshot error to the current user.

Change-Id: I4ca0a5af876a24c6bada1aa01678f3434425acae
 2016-05-20 16:58:57 +00:00
Winson
6e95485f50 Only broadcast screenshot error to the current user. 
am: 538c22630b

* commit '538c22630b3ffd3c9efd544552d5a7fb3ae876a8':
  Only broadcast screenshot error to the current user.

Change-Id: I0a0f1e04f9cc4bfcca3a9d1c93afad44759c6476
 2016-05-20 16:53:03 +00:00
Winson
e1a14b98a8 Only broadcast screenshot error to the current user. 
am: 538c22630b

* commit '538c22630b3ffd3c9efd544552d5a7fb3ae876a8':
  Only broadcast screenshot error to the current user.

Change-Id: I6eb8e2212bb837d25644d0e79abaef9c8a61f9a5
 2016-05-20 16:53:01 +00:00
Sanket Padawe
c4a4de836e Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev 
am: 096e99e25c

* commit '096e99e25ce30dbd7a86d6cd543e27a087fbb243':
  Add new TelephonyManager api to query Telephony metrics.

Change-Id: I5ba87e5c4e8c1b901f6ec98c94fed283aab24a36
 2016-05-20 16:52:40 +00:00
TreeHugger Robot
6c2bc3db95 Merge "Nav bar: fix tablet density change issues" into nyc-dev 2016-05-20 16:52:20 +00:00