drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
217,602 Commits 1 Branch 0 Tags
Commit Graph

217602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Hines
619a35b9e9 Merge "Remove unsupported RS graphics API tests." am: 7ea808b177 
am: 5a0a713147

* commit '5a0a713147a76195ae21d53d065633f117271793':
  Remove unsupported RS graphics API tests.
 2015-11-17 22:37:35 +00:00
Diego Perez
603544d4c4 Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev 2015-11-17 22:34:08 +00:00
Joe LaPenna
f7aceb60e3 Revert "Don\'t dispatch when non-interactive and the display is off." 
am: f2b9b2d85a

* commit 'f2b9b2d85ae1b48896ad6b685de4cda8fab1c8fb':
  Revert "Don't dispatch when non-interactive and the display is off."
 2015-11-17 22:32:57 +00:00
Stephen Hines
5a0a713147 Merge "Remove unsupported RS graphics API tests." 
am: 7ea808b177

* commit '7ea808b17736f690eb8d23729f33e9a612b0492c':
  Remove unsupported RS graphics API tests.
 2015-11-17 22:28:45 +00:00
Joe LaPenna
f2b9b2d85a Revert "Don't dispatch when non-interactive and the display is off." 
This reverts commit 2ccf0c8e636fd3be75c3a07f4cf60d72a4cfaa28.

BUG: 22422588
BUG: 25067918

Change-Id: I916c8bb19cd6a73c0be4bd3a0e3112938651e775
 2015-11-17 22:26:41 +00:00
Stephen Hines
7ea808b177 Merge "Remove unsupported RS graphics API tests." 2015-11-17 22:16:35 +00:00
Michael Wright
c85b56b0cb DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 am: 08ed2bc083 am: 41ef58be3e 
am: 8aa7e6a21a

* commit '8aa7e6a21a3428741159de2e28d87acb8b420e96':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 21:37:25 +00:00
Michael Wright
8aa7e6a21a DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 am: 08ed2bc083 
am: 41ef58be3e

* commit '41ef58be3e5a968c58ed138861ab6a0f7ff013a6':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 21:18:16 +00:00
Chad Brubaker
1627a091f4 Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647 
am: 97f92ce41e

* commit '97f92ce41e66b54e56733f18bdaae056f08c0ae7':
  Add NetworkSecurityConfigProvider.install
 2015-11-17 21:18:12 +00:00
Michael Wright
41ef58be3e DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours am: 18a2ac0506 
am: 08ed2bc083

* commit '08ed2bc083fe142ea6f89f97172543327f423e61':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:59:42 +00:00
Chad Brubaker
97f92ce41e Merge "Add NetworkSecurityConfigProvider.install" 
am: 08181cf647

* commit '08181cf647b1a1e440528f3f58ef6bf4e98a4832':
  Add NetworkSecurityConfigProvider.install
 2015-11-17 20:59:04 +00:00
Deepanshu Gupta
377cc4887d Revert "LayoutLib: Fix true transparency in status bar." 
am: 4ea74d2960

* commit '4ea74d2960688db6aa13452765dd5f2d07a40189':
  Revert "LayoutLib: Fix true transparency in status bar."
 2015-11-17 20:50:07 +00:00
Chad Brubaker
08181cf647 Merge "Add NetworkSecurityConfigProvider.install" 2015-11-17 20:46:49 +00:00
Michael Wright
08ed2bc083 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 am: bd23716585 -s ours 
am: 18a2ac0506

* commit '18a2ac0506ec834c2522de94040dab9e77304e7b':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:41:39 +00:00
Deepanshu Gupta
dd97829cf2 Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev 
am: 42a893b50b

* commit '42a893b50b2763d7a2a3da4006c9433afaf86cfd':
  AppCompatActionBar: use findClass to test presence
 2015-11-17 20:32:31 +00:00
Deepanshu Gupta
4ea74d2960 Revert "LayoutLib: Fix true transparency in status bar." 
This reverts commit 4eb298a941c3f465944b63f1a06518e911681c89.

Even though this is techinically closer to what the framework does, the
fix is not complete. As a result, it looks worse when using AppCompat
themes. Revert the change for the release.

Change-Id: I67c1002ea17dee7234d78e2d13aab876467bd70f
 2015-11-17 12:25:25 -08:00
Michael Wright
18a2ac0506 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405 
am: bd23716585  -s ours

* commit 'bd23716585bd21b4dc4bf87bd56ce588c8d457df':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:24:16 +00:00
Svetoslav Ganov
9bf367030c Merge "Handle renamed packages during default grants" am: 140b101fcd 
am: 60cb22008c

* commit '60cb22008c602c5345504eacb4eb68ea0ac69cf0':
  Handle renamed packages during default grants
 2015-11-17 20:24:06 +00:00
Deepanshu Gupta
42a893b50b Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev 2015-11-17 20:22:43 +00:00
Michael Wright
bd23716585 DO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de 
am: 614ea46405

* commit '614ea464051835e1c2267ef2bc343f98b62b177a':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 20:06:27 +00:00
Colin Cross
68cea4e7d1 Merge "Vibra: Add loading of the vibrator hardware module." am: 5603eca33c 
am: 358ad4980f

* commit '358ad4980fd6ea0ed22e81b3816572ec9ba39f53':
  Vibra: Add loading of the vibrator hardware module.
 2015-11-17 20:06:25 +00:00
Svetoslav Ganov
60cb22008c Merge "Handle renamed packages during default grants" 
am: 140b101fcd

* commit '140b101fcdbdf413b914b5625b19577784ad9d88':
  Handle renamed packages during default grants
 2015-11-17 20:06:21 +00:00
Svetoslav Ganov
140b101fcd Merge "Handle renamed packages during default grants" 2015-11-17 19:55:37 +00:00
Deepanshu Gupta
ab45fc1a4f LayoutLib: IntelliJ changed project files. 
am: 22931224d9

* commit '22931224d9a9845d316a9ea30e56557bec0b2e45':
  LayoutLib: IntelliJ changed project files.
 2015-11-17 19:54:06 +00:00
Svet Ganov
f443384d9e Handle renamed packages during default grants 
If an L device has a privileged app on the system image which was
updated and an M OTA renames the app package (supported only for
privileged apps) we end up with a disabled system package setting
with no package information. Since we are not doing a null check
of the package we get from the disabled package settings during
default grants we crash leaving the system in a bad state.

bug:25687380

Change-Id: I4f2ebcaf471e4bd1696298eab4716b50c52ca5c4
 2015-11-17 11:53:31 -08:00
Michael Wright
614ea46405 DO NOT MERGE. Prevent recents from coming up when in SUW 
am: 84669ca8de

* commit '84669ca8de55d38073a0dcb01074233b0a417541':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 19:52:13 +00:00
Colin Cross
358ad4980f Merge "Vibra: Add loading of the vibrator hardware module." 
am: 5603eca33c

* commit '5603eca33c8e322997029d3101fd2442df3c274e':
  Vibra: Add loading of the vibrator hardware module.
 2015-11-17 19:51:57 +00:00
Michael Wright
46f92eafe6 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab 
am: 053f241cc7

* commit '053f241cc7cc23f41fde42c6a0c9ecf2f8cd2830':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 19:51:53 +00:00
Deepanshu Gupta
22931224d9 LayoutLib: IntelliJ changed project files. 
Change-Id: I1f99ab678067c26ba2e9938c9dce40c99a6725c3
 2015-11-17 11:37:35 -08:00
Deepanshu Gupta
99b54b364b AppCompatActionBar: use findClass to test presence 
To test the presence of WindowDecorActionBar class, use findClass()
instead of loadClass() which logs warnings.

Change-Id: Ice8a5a6badd764c7f75b5a64a07c48f0a7cfef98
 2015-11-17 11:34:32 -08:00
Colin Cross
5603eca33c Merge "Vibra: Add loading of the vibrator hardware module." 2015-11-17 19:31:19 +00:00
Chad Brubaker
d2347a89fb Merge "Dedupe trust anchors" am: 690b5f6c0a 
am: e2caaea951

* commit 'e2caaea951e62a21bb1d30450e8085f3286ea538':
  Dedupe trust anchors
 2015-11-17 19:05:17 +00:00
Chad Brubaker
e2caaea951 Merge "Dedupe trust anchors" 
am: 690b5f6c0a

* commit '690b5f6c0a0820411d72235b11f75e1c87b24031':
  Dedupe trust anchors
 2015-11-17 18:57:06 +00:00
Michael Wright
053f241cc7 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 
am: c73255d8ab

* commit 'c73255d8abb343dc88ea56f7f8f5d2fd3dcfeb63':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 18:57:03 +00:00
Chad Brubaker
690b5f6c0a Merge "Dedupe trust anchors" 2015-11-17 18:51:38 +00:00
Michael Wright
c73255d8ab Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 
am: 313c7b2ee0

* commit '313c7b2ee07ea74ac184294e4a6133a813bfcabf':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 18:49:32 +00:00
Michael Wright
313c7b2ee0 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev 
am: 4aa1e48a71

* commit '4aa1e48a71df78fed20ac4105a2bd97ff04addf7':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 18:40:21 +00:00
Michael Wright
4aa1e48a71 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev 2015-11-17 18:33:38 +00:00
Bryce Lee
4b60d12ef9 Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 
am: 0fa22022a3

* commit '0fa22022a378db8de881af397b73d28b0939e5ff':
  Add Bluetooth headset API to allow disabling audio route.
 2015-11-17 16:22:02 +00:00
Bryce Lee
0fa22022a3 Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev 
am: cb8749c903

* commit 'cb8749c903d29fd04944550b5f34cc6120b69232':
  Add Bluetooth headset API to allow disabling audio route.
 2015-11-17 16:14:55 +00:00
Bryce Lee
cb8749c903 Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev 2015-11-17 16:08:44 +00:00
Joe LaPenna
70e0b4239c Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917 -s ours 
am: 7f0a1556ec  -s ours

* commit '7f0a1556ecebe9cd861296897000e4b61f541158':
  Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
 2015-11-17 02:55:48 +00:00
Joe LaPenna
7f0a1556ec Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev 
am: d083b37917  -s ours

* commit 'd083b379174b6cdfdd40204f4d4f4207fa2f332e':
  Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
 2015-11-17 02:47:59 +00:00
Joe LaPenna
d083b37917 Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev 2015-11-17 02:42:22 +00:00
Joe LaPenna
f6ca46d301 Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE" 
This reverts commit 88c7c3e08051f4a2be8ee5194214678a07ff7f01.

Change-Id: I2c6d7d1d076bee0dc905d0986ced55e49481af26
BUG: 23753686
 2015-11-17 02:42:10 +00:00
Eino-Ville Talvala
7ca29b3ea2 Merge "Don\'t use timestamps with all zero" am: 9574e58027 
am: be1a3f8b66

* commit 'be1a3f8b66d69427ae801b4a56f872da3328ec51':
  Don't use timestamps with all zero
 2015-11-17 02:10:52 +00:00
Eino-Ville Talvala
be1a3f8b66 Merge "Don\'t use timestamps with all zero" 
am: 9574e58027

* commit '9574e58027f8edeb539ecedf2988c1a302887807':
  Don't use timestamps with all zero
 2015-11-17 02:00:53 +00:00
Eino-Ville Talvala
9574e58027 Merge "Don't use timestamps with all zero" 2015-11-17 01:55:38 +00:00
Sanket Padawe
3bc8979d74 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae am: 63e6aa8571 
am: 32a190bd78

* commit '32a190bd787cbecfc4c87cda50ab6973b9e1c3cb':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 01:43:08 +00:00
Sanket Padawe
32a190bd78 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 am: ccfcb636ae 
am: 63e6aa8571

* commit '63e6aa8571386dcf33ff0cf3949bdaf6c8e350db':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 01:33:24 +00:00