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
Android Build Merger (Role)
b61ad7f393 Merge "Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 am: 0a6d5112f1 am: 11212a4822" into nyc-mr1-dev-plus-aosp 2016-05-24 21:42:43 +00:00
Android Build Merger (Role)
3b5dc2c480 Merge "Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb am: 5e5e871fdc" into nyc-mr1-dev-plus-aosp 2016-05-24 21:42:32 +00:00
Allen Hair
7fe6852854 Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7 
am: f90c5c5f5a

* commit 'f90c5c5f5aaa0facbfca1a9448fde6948c907c26':
  Deprecate shell-based UI Automator.

Change-Id: Ia9c137231e0815bb0b6d703d1b538148f5d843ec
 2016-05-24 21:41:49 +00:00
Amanda Kassay
5b8a1fbdbb Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 am: 0a6d5112f1 
am: 11212a4822

* commit '11212a48228c912feef41b97289384ac4394bb5c':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: I91e90bcc831056378654e5ee8c39d8116ab0f595
 2016-05-24 21:41:44 +00:00
Adam Lesinski
2eabf05fc9 Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb 
am: 5e5e871fdc

* commit '5e5e871fdc0b51ba5b0903169451e9401b98f1f3':
  Improve performance of LocaleList with Resources

Change-Id: I86abeb2c4edfec2aad47ac3aec4d79017e2191c8
 2016-05-24 21:41:37 +00:00
Allen Hair
3faf6c2e6c Merge "Deprecate shell-based UI Automator." into nyc-dev am: f298f4a7c7 
am: 79f42608c2

* commit '79f42608c265ecc22c09d239bdfd04dcaafca616':
  Deprecate shell-based UI Automator.

Change-Id: I9173d27b964f7ccf05b6f84c7e71a3fe4b3b7033
 2016-05-24 21:41:32 +00:00
Amanda Kassay
49b9190d48 Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 am: 0a6d5112f1 
am: 38ffaa1c51

* commit '38ffaa1c51627cd3ccee2f45e1d06c2fdd4ed3ba':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: Ibbb2c1987b4afbb8e3d692b1f8ae66b364d81883
 2016-05-24 21:41:26 +00:00
Adam Lesinski
9ed84d8612 Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb 
am: 5e106dea45

* commit '5e106dea4545547f3f7c50dad30f792809659b96':
  Improve performance of LocaleList with Resources

Change-Id: I733cdad0b30069ac7830fa91ef0188dd0f0cfac9
 2016-05-24 21:41:20 +00:00
Tianjie Xu
acf91cd6c5 Merge "Report OTA time statistics" into nyc-dev 
am: 86f97177e9

* commit '86f97177e959cb40229010b90f066fd602d6a06f':
  Report OTA time statistics

Change-Id: I271c156232c49a861579acd9ce90c91fbc7e5a4f
 2016-05-24 21:41:06 +00:00
Tianjie Xu
7135fab76c Merge "Report OTA time statistics" into nyc-dev 
am: 86f97177e9

* commit '86f97177e959cb40229010b90f066fd602d6a06f':
  Report OTA time statistics

Change-Id: I941b48f287fe72dbb3e0f61ccdea33deab3c34c5
 2016-05-24 21:41:05 +00:00
Sudheer Shanka
c32abe8646 Fix usermanager related tests. 
- Fix failing test
- Updates to include in continuous test execution

Fixes: 28938682
Change-Id: I17dd9ca5cf2579f0649f3939b00b08fa71a106cf
 2016-05-24 14:40:59 -07:00
Android Build Merger (Role)
4d1d0bcc4a Merge "Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a am: 2c5efb4827" into nyc-mr1-dev-plus-aosp 2016-05-24 21:36:30 +00:00
Android Build Merger (Role)
c95cc27856 Merge "Merge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f8b am: 03174b8cca" into nyc-mr1-dev-plus-aosp 2016-05-24 21:36:22 +00:00
Allen Hair
79f42608c2 Merge "Deprecate shell-based UI Automator." into nyc-dev 
am: f298f4a7c7

* commit 'f298f4a7c779588821b744c7247fc896541cae57':
  Deprecate shell-based UI Automator.

Change-Id: I0f8f99ddc4dd1048a84ab9f6f7edc19d923c7a75
 2016-05-24 21:36:20 +00:00
Android Build Merger (Role)
3e7ba53698 Merge "Merge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19 am: 8a78cbc1fa" into nyc-mr1-dev-plus-aosp 2016-05-24 21:36:13 +00:00
Amanda Kassay
38ffaa1c51 Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 
am: 0a6d5112f1

* commit '0a6d5112f1c0f0574ecf62b440541fca4736a706':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: Ic7898fd17a5b3ce47a3dc67364635e33436b97d2
 2016-05-24 21:36:08 +00:00
Adam Lesinski
5e106dea45 Merge "Improve performance of LocaleList with Resources" into nyc-dev 
am: bb26248bbb

* commit 'bb26248bbba6e4014ea89a97b86618b7289a5f29':
  Improve performance of LocaleList with Resources

Change-Id: Ic43a26915a28d71a967eb038331a0f3c31bdfe8f
 2016-05-24 21:35:56 +00:00
Tianjie Xu
86f97177e9 Merge "Report OTA time statistics" into nyc-dev 2016-05-24 21:35:25 +00:00
Jean-Michel Trivi
88251bcb54 Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a 
am: 2c5efb4827

* commit '2c5efb4827a7ca8e9a5f55c1c1bed00f4e2b23da':

Change-Id: Iaa368df4f90474feae621b513183f0c6c0815213
 2016-05-24 21:35:19 +00:00
Adrian Roos
07b9cf219b Merge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f8b 
am: 03174b8cca

* commit '03174b8cca8bd100e2179201383eeeebd65bd224':

Change-Id: I0f77b1039a58ce6a36f96375ded48293b2c6487b
 2016-05-24 21:35:16 +00:00
Adrian Roos
de882ee5bf Merge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19 
am: 8a78cbc1fa

* commit '8a78cbc1fa996a458759ff51fa8ceec2f2223270':

Change-Id: I11fd663bc6dda425fe3e4e74a64bd2a697aa8cb2
 2016-05-24 21:35:12 +00:00
Michael Kwan
9fcefb4c1d Merge "Fixed issue where ListView checked state did not account for ListView header." into nyc-mr1-dev 
am: 02178609c6

* commit '02178609c69d395d7ddbae2db278e50572cceec3':
  Fixed issue where ListView checked state did not account for ListView header.

Change-Id: I6f5fd65a9632a2f262c2e7a807cae487c4d5c0bc
 2016-05-24 21:35:07 +00:00
Allen Hair
f90c5c5f5a Merge "Deprecate shell-based UI Automator." into nyc-dev 
am: f298f4a7c7

* commit 'f298f4a7c779588821b744c7247fc896541cae57':
  Deprecate shell-based UI Automator.

Change-Id: Iaea8d67bd6bf9f57b3033eaefcb103d9f2e022dd
 2016-05-24 21:34:53 +00:00
Amanda Kassay
11212a4822 Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345 
am: 0a6d5112f1

* commit '0a6d5112f1c0f0574ecf62b440541fca4736a706':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: I8e4e87f0db6d10b13586c1c6464e941953b5e74a
 2016-05-24 21:34:51 +00:00
Adam Lesinski
5e5e871fdc Merge "Improve performance of LocaleList with Resources" into nyc-dev 
am: bb26248bbb

* commit 'bb26248bbba6e4014ea89a97b86618b7289a5f29':
  Improve performance of LocaleList with Resources

Change-Id: I307b4a7c78ff04797fda041afa8106b082951bc9
 2016-05-24 21:34:48 +00:00
Johan T. Halseth
244259a063 Adding grantPermission for packageName 
Adding a hidden API in UsbManager for system services to grant
permissions to a specific package for a USB device without showing a
user dialog.

Bug: 28760255
Change-Id: Ie68cfc784b7894e9db12ab61bab0f7e6bfa369e3
 2016-05-24 22:34:35 +01:00
Jean-Michel Trivi
1e34fb313b Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev am: 3a91a8417a 
am: 30979c2c76

* commit '30979c2c765a647b85e98691e517bb3d4d395668':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I250ba004e8389be3b98151f7173cf729a6c386d0
 2016-05-24 21:31:14 +00:00
Allen Hair
f298f4a7c7 Merge "Deprecate shell-based UI Automator." into nyc-dev 2016-05-24 21:29:45 +00:00
Amanda Kassay
0a6d5112f1 Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d 
am: 5a00e9d345

* commit '5a00e9d3450e0baccc89a88e586f8ce558e14aac':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: I1d972ef1511ff8205ec54f1af7241db104ea976a
 2016-05-24 21:28:50 +00:00
Michael Kwan
02178609c6 Merge "Fixed issue where ListView checked state did not account for ListView header." into nyc-mr1-dev 2016-05-24 21:27:20 +00:00
Adam Lesinski
bb26248bbb Merge "Improve performance of LocaleList with Resources" into nyc-dev 2016-05-24 21:25:41 +00:00
Jean-Michel Trivi
2c5efb4827 Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev 
am: 3a91a8417a

* commit '3a91a8417a9de03a2f8f276fcd2d67dc43315464':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I1211c2411d052762d95896c0e22661bd718c3039
 2016-05-24 21:24:03 +00:00
Adrian Roos
03174b8cca Merge "Keep notifications with active remote inputs" into nyc-dev 
am: 0444314f8b

* commit '0444314f8b0f77519c47b567f970cc95dd568f7f':
  Keep notifications with active remote inputs

Change-Id: I478f812b2a6d347cc689652448de46eb922b86a9
 2016-05-24 21:23:59 +00:00
Adrian Roos
8a78cbc1fa Merge "Fix janky swiping with RemoteInputViews" into nyc-dev 
am: a9c0d3ff19

* commit 'a9c0d3ff19461b0384ac4a586cd67e2084193604':
  Fix janky swiping with RemoteInputViews

Change-Id: Ie462da81453bbd509ea3ae3c49fdedd611c98cbd
 2016-05-24 21:23:54 +00:00
Amanda Kassay
5a00e9d345 Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 
am: e468c2380d

* commit 'e468c2380ddcc1a7c1f2fa3c9995ad999e9c0ca8':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: Ibb8848aed348e85fff5a47562212e88172557b0b
 2016-05-24 21:23:50 +00:00
Adrian Roos
3f9d2173fd Merge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f8b 
am: 6c4060c8fb

* commit '6c4060c8fba743ea02b2d470dbde5eb06de4b41b':
  Keep notifications with active remote inputs

Change-Id: I40fad56ffd168fdfd4f5729d0e530ce2c81b59e6
 2016-05-24 21:23:44 +00:00
Adrian Roos
0d6f7bd749 Merge "Fix janky swiping with RemoteInputViews" into nyc-dev am: a9c0d3ff19 
am: 1b608e20da

* commit '1b608e20da261d4698a139c522af1cd139e0e1c5':
  Fix janky swiping with RemoteInputViews

Change-Id: Ic721aec5281120482e8145dd237ed79d75ad6a12
 2016-05-24 21:23:39 +00:00
Jean-Michel Trivi
30979c2c76 Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev 
am: 3a91a8417a

* commit '3a91a8417a9de03a2f8f276fcd2d67dc43315464':
  Remove deprecated AudioManager.AudioRecordingCallback method

Change-Id: I5842a7067c383d30f610c72c3511a4dfeb90540c
 2016-05-24 21:23:29 +00:00
Rubin Xu
68a5aabde4 Elaborate on requirement to support PreRebootSecurityLogs 
Bug: 28160645
Change-Id: I21220b33747b4f62d7c84146dd2705ebfb7892bf
 2016-05-24 22:22:48 +01:00
Selim Cinek
ea66ca0225 Fixed a few battery issues in SystemUI 
Fixed a bug where animators could run forever because of
a negative start delay.
Also fixed a bug where the shadow would continuously update
when it shouldn't.

Change-Id: Id115d179d99fecf72c5f2b3be1a4c8590361469e
Fixes: 28930837
 2016-05-24 14:22:21 -07:00
Adrian Roos
6c4060c8fb Merge "Keep notifications with active remote inputs" into nyc-dev 
am: 0444314f8b

* commit '0444314f8b0f77519c47b567f970cc95dd568f7f':
  Keep notifications with active remote inputs

Change-Id: If4701470bcce953058cb4126d4ce492c576ef807
 2016-05-24 21:19:29 +00:00
Adrian Roos
1b608e20da Merge "Fix janky swiping with RemoteInputViews" into nyc-dev 
am: a9c0d3ff19

* commit 'a9c0d3ff19461b0384ac4a586cd67e2084193604':
  Fix janky swiping with RemoteInputViews

Change-Id: I3d89c5c0bcb4701335af0f18791e993a50501863
 2016-05-24 21:19:26 +00:00
Jean-Michel Trivi
3a91a8417a Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev 2016-05-24 21:17:49 +00:00
Pavlin Radoslavov
2b016a1711 Reduced the impact of "synchronized" statements 
* Removed "synchronized" statements that are not needed
* Replaced "synchronized" statements with Read/Write lock as
 appropriate. The lock protects the access to and the setting of
 BluetoothAdapter.mService and BluetoothManagerService.mBluetooth and
 associated state.

Bug: 28734075
Bug: 28799467
Change-Id: I8f8281c505f0a1ae0add1e14a3caba1f5b2a98e4
(cherry picked from commit eb50a39e98)
 2016-05-24 21:17:42 +00:00
Mady Mellor
f916151173 Merge "Children should have backgrounds" into nyc-dev am: 31e49b0964 
am: 470c001355

* commit '470c001355894b92724901924188c2be7d53e90f':

Change-Id: I3af3c40c4d19c82afad6138b001383bcde778551
 2016-05-24 21:15:34 +00:00
Adrian Roos
0444314f8b Merge "Keep notifications with active remote inputs" into nyc-dev 2016-05-24 21:13:30 +00:00
Mady Mellor
a016449a83 Merge "Children should have backgrounds" into nyc-dev am: 31e49b0964 
am: 12021f5020

* commit '12021f5020a057b3c0be8643bf5a8a999f488732':
  Children should have backgrounds

Change-Id: I5343b9b9aa4fb6c5e1f343cf5f4927c44bd5489d
 2016-05-24 21:13:25 +00:00
Adrian Roos
a9c0d3ff19 Merge "Fix janky swiping with RemoteInputViews" into nyc-dev 2016-05-24 21:13:21 +00:00
Amanda Kassay
e468c2380d Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. 
am: 85b7df2697

* commit '85b7df26975997826a738a46ae4ab797941175ea':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: If25728a85efb5b0ed46e87c45916621d8ad1d9ab
 2016-05-24 21:12:15 +00:00
Mady Mellor
470c001355 Merge "Children should have backgrounds" into nyc-dev 
am: 31e49b0964

* commit '31e49b0964cfba0b6b91e8ae67cbc04730098569':
  Children should have backgrounds

Change-Id: I4c123a7cf9efd38c46ff155a70f5b9c053e4df02
 2016-05-24 21:09:33 +00:00