Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
213,350 Commits 3 Branches 0 Tags
dd97829cf2b8599058f0410ea45bc84cd86e839b
Commit Graph

213350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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 88c7c3e080.

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
Sanket Padawe
63e6aa8571 Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am: abea6dc466 
am: ccfcb636ae

* commit 'ccfcb636ae0c99b974f3cbe3177322c41e33bb15':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 01:23:47 +00:00
Deepanshu Gupta
ce400cd75e Merge "WindowDecorActionBar name change fix." into mnc-ub-dev 
am: 62302bd72a

* commit '62302bd72aaa6b0f934257447e8dcd636799180e':
  WindowDecorActionBar name change fix.
 2015-11-17 01:17:27 +00:00
Sanket Padawe
ccfcb636ae Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev 
am: abea6dc466

* commit 'abea6dc466cbd01be261192f8dbc083b58661bad':
  Don't allow contact sharing by default for device not recognized as carkit.
 2015-11-17 01:12:48 +00:00
Deepanshu Gupta
62302bd72a Merge "WindowDecorActionBar name change fix." into mnc-ub-dev 2015-11-17 01:11:10 +00:00
Sanket Padawe
abea6dc466 Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev 2015-11-17 01:07:28 +00:00
Michael Kwan
6881185307 DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c -s ours 
am: f23229f45f  -s ours

* commit 'f23229f45f010d42df5d27a4ca653ee6da8c5c1a':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
 2015-11-16 23:57:50 +00:00
Michael Kwan
f23229f45f DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. 
am: 8d6630b87c  -s ours

* commit '8d6630b87c93f569bbf5fc5b426fe2a1c2ff2ceb':
  DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
 2015-11-16 23:48:39 +00:00
Deepanshu Gupta
2b0551175d WindowDecorActionBar name change fix. 
In change id I7582e242c7564c32feeb044fc9eff6bfb5c56536,
WindowDecorActionBar's package name was changed. This breaks layoutlib.
Fix the issue by checking both package names when loading the class.

Change-Id: I5723a97f0f164d61c56061fef6cff18e3cdafaee
 2015-11-16 15:46:12 -08:00
Michael Kwan
8d6630b87c DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. 
Android currently forces USB into MTP mode if there was no modes
specified. This causes issues on Clockwork devices as they do not
support MTP.

The hack stops this behaviour, and also sets MTP mode back to none.

Bug: 25547826
Bug: 25582050
Bug: 25244201
Change-Id: I772e35d0a5db51b17e9d71c59e6a157dabb1d296
 2015-11-16 14:05:29 -08:00
Eino-Ville Talvala
f5b98ee1dc Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c 
am: 784f0f15a9

* commit '784f0f15a9a2026ee1acd57f9fca4e3dff28c090':
  Camera: Minor documentation update
 2015-11-16 20:35:51 +00:00
Alex Klyubin
00245ffce4 Merge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e 
am: 5995579f5f

* commit '5995579f5ff1511f4a089dd0537cd634fb615465':
  Insert Android Keystore JCA Provider at the correct position.
 2015-11-16 20:31:36 +00:00
Eino-Ville Talvala
784f0f15a9 Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 
am: 062c629e5c

* commit '062c629e5c6270da232bbd2800966ab5dc6c615f':
  Camera: Minor documentation update
 2015-11-16 20:27:03 +00:00
Alex Klyubin
5995579f5f Merge "Insert Android Keystore JCA Provider at the correct position." 
am: 887d348d7e

* commit '887d348d7ed5e1c2a1687eb774db46d571a8f43d':
  Insert Android Keystore JCA Provider at the correct position.
 2015-11-16 20:22:51 +00:00
Eino-Ville Talvala
062c629e5c Camera: Minor documentation update am: 0b6e1bfae8 
am: 0691d16759

* commit '0691d16759bf58a93209d4ab156e96f96fed7092':
  Camera: Minor documentation update
 2015-11-16 20:16:45 +00:00
Alex Klyubin
887d348d7e Merge "Insert Android Keystore JCA Provider at the correct position." 2015-11-16 20:14:43 +00:00
Eino-Ville Talvala
0691d16759 Camera: Minor documentation update 
am: 0b6e1bfae8

* commit '0b6e1bfae848b7b177bba9c8119ad44cdc05684a':
  Camera: Minor documentation update
 2015-11-16 20:07:02 +00:00
Erik Wolsheimer
2fba776ee0 Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 
am: b45defae8e

* commit 'b45defae8e61a4fa3aba9dd08480861d10f5982a':
  Log errno when dup fd cannot be allocated BUG: 25165471
 2015-11-16 19:03:53 +00:00
Erik Wolsheimer
b45defae8e Log errno when dup fd cannot be allocated BUG: 25165471 
am: 211abad3b9

* commit '211abad3b92b70dd094949c79f67e686c940fa0c':
  Log errno when dup fd cannot be allocated BUG: 25165471
 2015-11-16 18:55:29 +00:00