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

213723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
b39fde2c42 Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 am: c24b39e0c0 
am: 579cc90e61

* commit '579cc90e61598c57a8225cbea4bfe035e5e1963c':
 2015-11-17 23:05:48 +00:00
Erik Wolsheimer
756b0d2ca2 Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c 
am: 7698dd970f

* commit '7698dd970fbfb81fcdc700827c1620440c6e81a1':
 2015-11-17 23:04:24 +00:00
Geoff Mendal
6dff6bc8cd Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev 
am: 812794f0f5  -s ours

* commit '812794f0f5dfba607bcdd648611317df10ca0d49':
  Import translations. DO NOT MERGE
 2015-11-17 23:02:57 +00:00
Geoff Mendal
73dedf661e Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d -s ours 
am: ee144ce3ba  -s ours

* commit 'ee144ce3baec585e19da454de95d05ed0f1a0bcf':
  Import translations. DO NOT MERGE
 2015-11-17 23:01:15 +00:00
Geoff Mendal
464ffe98cb Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours am: 4510d17575 -s ours 
am: fb17593356  -s ours

* commit 'fb175933566d5869e4d069334abec82f67665083':
 2015-11-17 22:59:32 +00:00
Diego Perez
0b76d094c6 Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev am: 603544d4c4 
am: 14a826380d

* commit '14a826380d12f4a5c48c1f9fb97b3b24ebddf0c7':
  Fix delegation of methods within inner static classes
 2015-11-17 22:52:52 +00:00
Joe LaPenna
617bd39465 Revert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a am: f7aceb60e3 
am: 2900dc2349

* commit '2900dc23496094dd3a3f44eaac688a304b49ba56':
  Revert "Don't dispatch when non-interactive and the display is off."
 2015-11-17 22:51:09 +00:00
Diego Perez
14a826380d Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev 
am: 603544d4c4

* commit '603544d4c42cd8e0cc46da04f28a8fead64665e3':
  Fix delegation of methods within inner static classes
 2015-11-17 22:43:15 +00:00
Joe LaPenna
2900dc2349 Revert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a 
am: f7aceb60e3

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

* commit '5a0a713147a76195ae21d53d065633f117271793':
  Remove unsupported RS graphics API tests.
 2015-11-17 22:37:34 +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
Michael Wright
c173429617 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 
am: 78f974a0b2

* commit '78f974a0b2c647223ad25089cda05ef04c12f2e2':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 22:23:50 +00:00
Stephen Hines
7ea808b177 Merge "Remove unsupported RS graphics API tests." 2015-11-17 22:16:35 +00:00
Michael Wright
78f974a0b2 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:27 +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
Deepanshu Gupta
6058efff69 Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960 
am: d67897e4fb

* commit 'd67897e4fb18b75c4707c7052b21a1bfc6579894':
  Revert "LayoutLib: Fix true transparency in status bar."
 2015-11-17 21:09:10 +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
0a9b4e5f00 Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b 
am: ef4050128a

* commit 'ef4050128a8c1557697395d37903c179e1ac977a':
  AppCompatActionBar: use findClass to test presence
 2015-11-17 20:50:23 +00:00
Deepanshu Gupta
d67897e4fb 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
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
ef4050128a 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:28 +00:00
Bryce Lee
dd976b1b0d DO NOT MERGE ANYWHERE 
Add ability to set supported audio routes on phone accounts and connection.

The set audio routes are used by Telecom to restrict where the audio may
be routed to. For example, an account can specify that calls may not be
routed over bluetooth headsets, which will prevent a new call from being
routed to this source.

Bug: 25485578
Change-Id: Ia1ca665e9ae8852a2538ab7cbeb3a73217d9b03b
 2015-11-17 12:31:53 -08: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
Deepanshu Gupta
e45abdb126 LayoutLib: IntelliJ changed project files. am: 22931224d9 
am: 66840955d8

* commit '66840955d817b2ca42a4a573dd9186b5ad5b25aa':
  LayoutLib: IntelliJ changed project files.
 2015-11-17 20:06:20 +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
66840955d8 LayoutLib: IntelliJ changed project files. 
am: 22931224d9

* commit '22931224d9a9845d316a9ea30e56557bec0b2e45':
  LayoutLib: IntelliJ changed project files.
 2015-11-17 19:51:52 +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
Michael Wright
cd00ba1a71 Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am: 4aa1e48a71 am: 313c7b2ee0 am: c73255d8ab am: 053f241cc7 
am: e2af036719

* commit 'e2af0367193332e340a759eae7dc37c5342fbc01':
  DO NOT MERGE. Prevent recents from coming up when in SUW
 2015-11-17 19:14:01 +00:00