OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Frameworks/base: Make RuntimeAbort more expressive" am: b61d3dd8a7
Andreas Gampe [Wed, 18 Nov 2015 18:11:11 +0000 (18:11 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive" am: b61d3dd8a7
am: a7e9f174c1

* commit 'a7e9f174c1f9ae35be6259de02f46aa8fa4d0a3c':
  Frameworks/base: Make RuntimeAbort more expressive

8 years agoMerge "Frameworks/base: Make RuntimeAbort more expressive"
Andreas Gampe [Wed, 18 Nov 2015 17:47:52 +0000 (17:47 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive"
am: b61d3dd8a7

* commit 'b61d3dd8a773be393c738675cff28fc799497535':
  Frameworks/base: Make RuntimeAbort more expressive

8 years agoMerge "Remove DEBUG_JIT from Zygote flags." am: cf49583bd0
Nicolas Geoffray [Wed, 18 Nov 2015 17:21:41 +0000 (17:21 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags." am: cf49583bd0
am: 5485d81578

* commit '5485d815788e4037829d70d041fe4fc1a35416f3':
  Remove DEBUG_JIT from Zygote flags.

8 years agoMerge "Frameworks/base: Make RuntimeAbort more expressive"
Andreas Gampe [Wed, 18 Nov 2015 17:16:59 +0000 (17:16 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive"

8 years agoMerge "Remove DEBUG_JIT from Zygote flags."
Nicolas Geoffray [Wed, 18 Nov 2015 10:54:19 +0000 (10:54 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
am: cf49583bd0

* commit 'cf49583bd02d01b5d7aa57912d5469b466722c65':
  Remove DEBUG_JIT from Zygote flags.

8 years agoMerge "Remove DEBUG_JIT from Zygote flags."
Nicolas Geoffray [Wed, 18 Nov 2015 10:47:50 +0000 (10:47 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."

8 years agoRemove DEBUG_JIT from Zygote flags.
Nicolas Geoffray [Thu, 5 Nov 2015 11:29:42 +0000 (11:29 +0000)]
Remove DEBUG_JIT from Zygote flags.

The flag is being obsolete by the move to JIT.

(cherry picked from commit 9abbf45c8dcdb2e5b13b615e5138ad996fe8afa3)

Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8

8 years agoFrameworks/base: Make RuntimeAbort more expressive
Andreas Gampe [Wed, 18 Nov 2015 00:38:59 +0000 (16:38 -0800)]
Frameworks/base: Make RuntimeAbort more expressive

Pass a message to FatalError, which will be more prominent in
aborts than "RuntimeAbort."

Change-Id: Icb3b8f50ca0cc15fd1346c530cd8e6452e951879

8 years agoMerge "Fix delegation of methods within inner static classes" into mnc-ub-dev am...
Diego Perez [Wed, 18 Nov 2015 00:13:20 +0000 (00:13 +0000)]
Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev am: 603544d4c4 am: 14a826380d
am: 0b76d094c6

* commit '0b76d094c6e121f21135d851e4ee6ce8b6ee625f':
  Fix delegation of methods within inner static classes

8 years agoRevert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a...
Joe LaPenna [Wed, 18 Nov 2015 00:12:02 +0000 (00:12 +0000)]
Revert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a am: f7aceb60e3 am: 2900dc2349
am: 617bd39465

* commit '617bd39465dd0b77ed2cf353728c2fe97c371b17':
  Revert "Don't dispatch when non-interactive and the display is off."

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea4640...
Michael Wright [Wed, 18 Nov 2015 00:10:45 +0000 (00:10 +0000)]
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
am: c173429617

* commit 'c173429617d2a8779f6a4a6ade5a9991f65f751b':

8 years agoRevert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960 am: d67897e4fb
Deepanshu Gupta [Wed, 18 Nov 2015 00:09:19 +0000 (00:09 +0000)]
Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960 am: d67897e4fb
am: 6058efff69

* commit '6058efff6991e390cfd06540130bdf4407da7522':

8 years agoMerge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893...
Deepanshu Gupta [Wed, 18 Nov 2015 00:07:49 +0000 (00:07 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b am: ef4050128a
am: 0a9b4e5f00

* commit '0a9b4e5f00fcc0f785085e642b7894fa14f16e0b':

8 years agoLayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8
Deepanshu Gupta [Wed, 18 Nov 2015 00:06:20 +0000 (00:06 +0000)]
LayoutLib: IntelliJ changed project files. am: 22931224d9 am: 66840955d8
am: e45abdb126

* commit 'e45abdb1267781c2f3f4fa65cb8771c5d01d0956':

8 years agoMerge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am...
Michael Wright [Wed, 18 Nov 2015 00:04:52 +0000 (00:04 +0000)]
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
am: cd00ba1a71

* commit 'cd00ba1a71bbb9edf92a0cc5def975be86207e4e':

8 years agoMerge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am...
Bryce Lee [Wed, 18 Nov 2015 00:03:17 +0000 (00:03 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3 am: e2861471b9
am: 52d93db91d

* commit '52d93db91dcf883f236c7b1e75d1dd4b2421a1d3':

8 years agoMerge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e...
Joe LaPenna [Wed, 18 Nov 2015 00:01:52 +0000 (00:01 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917  -s ours am: 7f0a1556ec  -s ours am: dbe1804f58  -s ours
am: 9cb81aa210  -s ours

* commit '9cb81aa210419ea14ff396fb533ad500094b00f2':

8 years agoMerge "Don\'t allow contact sharing by default for device not recognized as carkit...
Sanket Padawe [Wed, 18 Nov 2015 00:00:25 +0000 (00:00 +0000)]
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 am: 7bb34d7517
am: fc8f7cee01

* commit 'fc8f7cee0124bee1c75f05a18c112e37705836a9':

8 years agoMerge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a am:...
Deepanshu Gupta [Tue, 17 Nov 2015 23:58:48 +0000 (23:58 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a am: 80bd5e6fd7
am: 9f275ec3fd

* commit '9f275ec3fd422045f95c048905b112c0a93f4d34':

8 years agoDO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c...
Michael Kwan [Tue, 17 Nov 2015 23:57:12 +0000 (23:57 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am: 8d6630b87c  -s ours am: f23229f45f  -s ours am: b0aae584ea  -s ours
am: 2c8f3734af  -s ours

* commit '2c8f3734afd5f104166bfb045794970414eb5052':

8 years agoresolve merge conflicts of 5032e49f9e to mnc-dr2-dev-plus-aosp.
Rom Lemarchand [Tue, 17 Nov 2015 23:38:50 +0000 (15:38 -0800)]
resolve merge conflicts of 5032e49f9e to mnc-dr2-dev-plus-aosp.

Change-Id: If4a565a262befdc3d6e206c892e2be9711d52c0f

8 years agoCamera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am...
Eino-Ville Talvala [Tue, 17 Nov 2015 23:05:48 +0000 (23:05 +0000)]
Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 am: c24b39e0c0
am: 579cc90e61

* commit '579cc90e61598c57a8225cbea4bfe035e5e1963c':

8 years agoLog errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e...
Erik Wolsheimer [Tue, 17 Nov 2015 23:04:24 +0000 (23:04 +0000)]
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c
am: 7698dd970f

* commit '7698dd970fbfb81fcdc700827c1620440c6e81a1':

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 17 Nov 2015 23:02:57 +0000 (23:02 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am: 812794f0f5  -s ours

* commit '812794f0f5dfba607bcdd648611317df10ca0d49':
  Import translations. DO NOT MERGE

8 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d -s ours
Geoff Mendal [Tue, 17 Nov 2015 23:01:15 +0000 (23:01 +0000)]
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

8 years agoImport translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours...
Geoff Mendal [Tue, 17 Nov 2015 22:59:32 +0000 (22:59 +0000)]
Import translations. DO NOT MERGE am: 83d65fea01  -s ours am: a6c50551cd  -s ours am: 4510d17575  -s ours
am: fb17593356  -s ours

* commit 'fb175933566d5869e4d069334abec82f67665083':

8 years agoMerge "Fix delegation of methods within inner static classes" into mnc-ub-dev am...
Diego Perez [Tue, 17 Nov 2015 22:52:52 +0000 (22:52 +0000)]
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

8 years agoRevert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a...
Joe LaPenna [Tue, 17 Nov 2015 22:51:09 +0000 (22:51 +0000)]
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."

8 years agoMerge "Fix delegation of methods within inner static classes" into mnc-ub-dev
Diego Perez [Tue, 17 Nov 2015 22:43:15 +0000 (22:43 +0000)]
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

8 years agoRevert "Don\'t dispatch when non-interactive and the display is off." am: f2b9b2d85a
Joe LaPenna [Tue, 17 Nov 2015 22:41:46 +0000 (22:41 +0000)]
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."

8 years agoMerge "Remove unsupported RS graphics API tests." am: 7ea808b177
Stephen Hines [Tue, 17 Nov 2015 22:37:34 +0000 (22:37 +0000)]
Merge "Remove unsupported RS graphics API tests." am: 7ea808b177
am: 5a0a713147

* commit '5a0a713147a76195ae21d53d065633f117271793':
  Remove unsupported RS graphics API tests.

8 years agoMerge "Fix delegation of methods within inner static classes" into mnc-ub-dev
Diego Perez [Tue, 17 Nov 2015 22:34:08 +0000 (22:34 +0000)]
Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev

8 years agoRevert "Don\'t dispatch when non-interactive and the display is off."
Joe LaPenna [Tue, 17 Nov 2015 22:32:57 +0000 (22:32 +0000)]
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."

8 years agoMerge "Remove unsupported RS graphics API tests."
Stephen Hines [Tue, 17 Nov 2015 22:28:45 +0000 (22:28 +0000)]
Merge "Remove unsupported RS graphics API tests."
am: 7ea808b177

* commit '7ea808b17736f690eb8d23729f33e9a612b0492c':
  Remove unsupported RS graphics API tests.

8 years agoRevert "Don't dispatch when non-interactive and the display is off."
Joe LaPenna [Tue, 17 Nov 2015 22:22:37 +0000 (22:22 +0000)]
Revert "Don't dispatch when non-interactive and the display is off."

This reverts commit 2ccf0c8e636fd3be75c3a07f4cf60d72a4cfaa28.

BUG: 22422588
BUG: 25067918

Change-Id: I916c8bb19cd6a73c0be4bd3a0e3112938651e775

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea4640...
Michael Wright [Tue, 17 Nov 2015 22:23:50 +0000 (22:23 +0000)]
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

8 years agoMerge "Remove unsupported RS graphics API tests."
Stephen Hines [Tue, 17 Nov 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Remove unsupported RS graphics API tests."

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea4640...
Michael Wright [Tue, 17 Nov 2015 21:37:27 +0000 (21:37 +0000)]
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

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea4640...
Michael Wright [Tue, 17 Nov 2015 21:37:25 +0000 (21:37 +0000)]
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

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea4640...
Michael Wright [Tue, 17 Nov 2015 21:18:16 +0000 (21:18 +0000)]
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

8 years agoMerge "Add NetworkSecurityConfigProvider.install" am: 08181cf647
Chad Brubaker [Tue, 17 Nov 2015 21:18:12 +0000 (21:18 +0000)]
Merge "Add NetworkSecurityConfigProvider.install" am: 08181cf647
am: 97f92ce41e

* commit '97f92ce41e66b54e56733f18bdaae056f08c0ae7':
  Add NetworkSecurityConfigProvider.install

8 years agoRevert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960
Deepanshu Gupta [Tue, 17 Nov 2015 21:09:10 +0000 (21:09 +0000)]
Revert "LayoutLib: Fix true transparency in status bar." am: 4ea74d2960
am: d67897e4fb

* commit 'd67897e4fb18b75c4707c7052b21a1bfc6579894':
  Revert "LayoutLib: Fix true transparency in status bar."

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea4640...
Michael Wright [Tue, 17 Nov 2015 20:59:42 +0000 (20:59 +0000)]
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

8 years agoMerge "Add NetworkSecurityConfigProvider.install"
Chad Brubaker [Tue, 17 Nov 2015 20:59:04 +0000 (20:59 +0000)]
Merge "Add NetworkSecurityConfigProvider.install"
am: 08181cf647

* commit '08181cf647b1a1e440528f3f58ef6bf4e98a4832':
  Add NetworkSecurityConfigProvider.install

8 years agoMerge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b
Deepanshu Gupta [Tue, 17 Nov 2015 20:50:23 +0000 (20:50 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am: 42a893b50b
am: ef4050128a

* commit 'ef4050128a8c1557697395d37903c179e1ac977a':
  AppCompatActionBar: use findClass to test presence

8 years agoRevert "LayoutLib: Fix true transparency in status bar."
Deepanshu Gupta [Tue, 17 Nov 2015 20:50:07 +0000 (20:50 +0000)]
Revert "LayoutLib: Fix true transparency in status bar."
am: 4ea74d2960

* commit '4ea74d2960688db6aa13452765dd5f2d07a40189':
  Revert "LayoutLib: Fix true transparency in status bar."

8 years agoRevert "LayoutLib: Fix true transparency in status bar."
Deepanshu Gupta [Tue, 17 Nov 2015 20:50:07 +0000 (20:50 +0000)]
Revert "LayoutLib: Fix true transparency in status bar."
am: 4ea74d2960

* commit '4ea74d2960688db6aa13452765dd5f2d07a40189':
  Revert "LayoutLib: Fix true transparency in status bar."

8 years agoMerge "Add NetworkSecurityConfigProvider.install"
Chad Brubaker [Tue, 17 Nov 2015 20:46:49 +0000 (20:46 +0000)]
Merge "Add NetworkSecurityConfigProvider.install"

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea4640...
Michael Wright [Tue, 17 Nov 2015 20:41:39 +0000 (20:41 +0000)]
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

8 years agoMerge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
Deepanshu Gupta [Tue, 17 Nov 2015 20:32:31 +0000 (20:32 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
am: 42a893b50b

* commit '42a893b50b2763d7a2a3da4006c9433afaf86cfd':
  AppCompatActionBar: use findClass to test presence

8 years agoMerge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
Deepanshu Gupta [Tue, 17 Nov 2015 20:32:28 +0000 (20:32 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
am: 42a893b50b

* commit '42a893b50b2763d7a2a3da4006c9433afaf86cfd':
  AppCompatActionBar: use findClass to test presence

8 years agoRevert "LayoutLib: Fix true transparency in status bar."
Deepanshu Gupta [Tue, 17 Nov 2015 19:42:42 +0000 (11:42 -0800)]
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

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de am: 614ea46405
Michael Wright [Tue, 17 Nov 2015 20:24:16 +0000 (20:24 +0000)]
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

8 years agoMerge "Handle renamed packages during default grants" am: 140b101fcd
Svetoslav Ganov [Tue, 17 Nov 2015 20:24:06 +0000 (20:24 +0000)]
Merge "Handle renamed packages during default grants" am: 140b101fcd
am: 60cb22008c

* commit '60cb22008c602c5345504eacb4eb68ea0ac69cf0':
  Handle renamed packages during default grants

8 years agoMerge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
Deepanshu Gupta [Tue, 17 Nov 2015 20:22:43 +0000 (20:22 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW am: 84669ca8de
Michael Wright [Tue, 17 Nov 2015 20:06:27 +0000 (20:06 +0000)]
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

8 years agoMerge "Vibra: Add loading of the vibrator hardware module." am: 5603eca33c
Colin Cross [Tue, 17 Nov 2015 20:06:25 +0000 (20:06 +0000)]
Merge "Vibra: Add loading of the vibrator hardware module." am: 5603eca33c
am: 358ad4980f

* commit '358ad4980fd6ea0ed22e81b3816572ec9ba39f53':
  Vibra: Add loading of the vibrator hardware module.

8 years agoMerge "Handle renamed packages during default grants"
Svetoslav Ganov [Tue, 17 Nov 2015 20:06:21 +0000 (20:06 +0000)]
Merge "Handle renamed packages during default grants"
am: 140b101fcd

* commit '140b101fcdbdf413b914b5625b19577784ad9d88':
  Handle renamed packages during default grants

8 years agoLayoutLib: IntelliJ changed project files. am: 22931224d9
Deepanshu Gupta [Tue, 17 Nov 2015 20:06:20 +0000 (20:06 +0000)]
LayoutLib: IntelliJ changed project files. am: 22931224d9
am: 66840955d8

* commit '66840955d817b2ca42a4a573dd9186b5ad5b25aa':
  LayoutLib: IntelliJ changed project files.

8 years agoMerge "Handle renamed packages during default grants"
Svetoslav Ganov [Tue, 17 Nov 2015 19:55:37 +0000 (19:55 +0000)]
Merge "Handle renamed packages during default grants"

8 years agoLayoutLib: IntelliJ changed project files.
Deepanshu Gupta [Tue, 17 Nov 2015 19:54:06 +0000 (19:54 +0000)]
LayoutLib: IntelliJ changed project files.
am: 22931224d9

* commit '22931224d9a9845d316a9ea30e56557bec0b2e45':
  LayoutLib: IntelliJ changed project files.

8 years agoHandle renamed packages during default grants
Svet Ganov [Tue, 17 Nov 2015 19:53:18 +0000 (11:53 -0800)]
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

8 years agoDO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 19:52:13 +0000 (19:52 +0000)]
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

8 years agoMerge "Vibra: Add loading of the vibrator hardware module."
Colin Cross [Tue, 17 Nov 2015 19:51:57 +0000 (19:51 +0000)]
Merge "Vibra: Add loading of the vibrator hardware module."
am: 5603eca33c

* commit '5603eca33c8e322997029d3101fd2442df3c274e':
  Vibra: Add loading of the vibrator hardware module.

8 years agoMerge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am...
Michael Wright [Tue, 17 Nov 2015 19:51:53 +0000 (19:51 +0000)]
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

8 years agoLayoutLib: IntelliJ changed project files.
Deepanshu Gupta [Tue, 17 Nov 2015 19:51:52 +0000 (19:51 +0000)]
LayoutLib: IntelliJ changed project files.
am: 22931224d9

* commit '22931224d9a9845d316a9ea30e56557bec0b2e45':
  LayoutLib: IntelliJ changed project files.

8 years agoLayoutLib: IntelliJ changed project files.
Deepanshu Gupta [Tue, 17 Nov 2015 19:37:35 +0000 (11:37 -0800)]
LayoutLib: IntelliJ changed project files.

Change-Id: I1f99ab678067c26ba2e9938c9dce40c99a6725c3

8 years agoAppCompatActionBar: use findClass to test presence
Deepanshu Gupta [Tue, 17 Nov 2015 19:34:32 +0000 (11:34 -0800)]
AppCompatActionBar: use findClass to test presence

To test the presence of WindowDecorActionBar class, use findClass()
instead of loadClass() which logs warnings.

Change-Id: Ice8a5a6badd764c7f75b5a64a07c48f0a7cfef98

8 years agoMerge "Vibra: Add loading of the vibrator hardware module."
Colin Cross [Tue, 17 Nov 2015 19:31:19 +0000 (19:31 +0000)]
Merge "Vibra: Add loading of the vibrator hardware module."

8 years agoMerge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am...
Michael Wright [Tue, 17 Nov 2015 19:14:01 +0000 (19:14 +0000)]
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

8 years agoMerge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am...
Michael Wright [Tue, 17 Nov 2015 19:05:20 +0000 (19:05 +0000)]
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

8 years agoMerge "Dedupe trust anchors" am: 690b5f6c0a
Chad Brubaker [Tue, 17 Nov 2015 19:05:17 +0000 (19:05 +0000)]
Merge "Dedupe trust anchors" am: 690b5f6c0a
am: e2caaea951

* commit 'e2caaea951e62a21bb1d30450e8085f3286ea538':
  Dedupe trust anchors

8 years agoMerge "Dedupe trust anchors"
Chad Brubaker [Tue, 17 Nov 2015 18:57:06 +0000 (18:57 +0000)]
Merge "Dedupe trust anchors"
am: 690b5f6c0a

* commit '690b5f6c0a0820411d72235b11f75e1c87b24031':
  Dedupe trust anchors

8 years agoMerge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am...
Michael Wright [Tue, 17 Nov 2015 18:57:03 +0000 (18:57 +0000)]
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

8 years agoMerge "Dedupe trust anchors"
Chad Brubaker [Tue, 17 Nov 2015 18:51:38 +0000 (18:51 +0000)]
Merge "Dedupe trust anchors"

8 years agoMerge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am...
Michael Wright [Tue, 17 Nov 2015 18:49:32 +0000 (18:49 +0000)]
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

8 years agoMerge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
Michael Wright [Tue, 17 Nov 2015 18:40:21 +0000 (18:40 +0000)]
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

8 years agoMerge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
Michael Wright [Tue, 17 Nov 2015 18:33:38 +0000 (18:33 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev

8 years agoMerge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am...
Bryce Lee [Tue, 17 Nov 2015 16:28:47 +0000 (16:28 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am: cb8749c903 am: 0fa22022a3
am: e2861471b9

* commit 'e2861471b906d94b1211beeee824ae43b7e931c3':
  Add Bluetooth headset API to allow disabling audio route.

8 years agoMerge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am...
Bryce Lee [Tue, 17 Nov 2015 16:22:02 +0000 (16:22 +0000)]
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.

8 years agoMerge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am...
Bryce Lee [Tue, 17 Nov 2015 16:21:59 +0000 (16:21 +0000)]
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.

8 years agoMerge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev
Bryce Lee [Tue, 17 Nov 2015 16:14:55 +0000 (16:14 +0000)]
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.

8 years agoMerge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev
Bryce Lee [Tue, 17 Nov 2015 16:08:44 +0000 (16:08 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev

8 years agoMerge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e...
Joe LaPenna [Tue, 17 Nov 2015 03:03:13 +0000 (03:03 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am: d083b37917  -s ours am: 7f0a1556ec  -s ours
am: dbe1804f58  -s ours

* commit 'dbe1804f580dcde68ac272b865808a8263219efb':
  Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"

8 years agoMerge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e...
Joe LaPenna [Tue, 17 Nov 2015 02:55:48 +0000 (02:55 +0000)]
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"

8 years agoMerge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e...
Joe LaPenna [Tue, 17 Nov 2015 02:55:44 +0000 (02:55 +0000)]
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"

8 years agoMerge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev
Joe LaPenna [Tue, 17 Nov 2015 02:47:59 +0000 (02:47 +0000)]
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"

8 years agoMerge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev
Joe LaPenna [Tue, 17 Nov 2015 02:42:22 +0000 (02:42 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev

8 years agoRevert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Joe LaPenna [Tue, 17 Nov 2015 02:42:10 +0000 (02:42 +0000)]
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"

This reverts commit 88c7c3e08051f4a2be8ee5194214678a07ff7f01.

Change-Id: I2c6d7d1d076bee0dc905d0986ced55e49481af26
BUG: 23753686

8 years agoMerge "Don\'t use timestamps with all zero" am: 9574e58027
Eino-Ville Talvala [Tue, 17 Nov 2015 02:10:52 +0000 (02:10 +0000)]
Merge "Don\'t use timestamps with all zero" am: 9574e58027
am: be1a3f8b66

* commit 'be1a3f8b66d69427ae801b4a56f872da3328ec51':
  Don't use timestamps with all zero

8 years agoMerge "Don\'t use timestamps with all zero"
Eino-Ville Talvala [Tue, 17 Nov 2015 02:00:53 +0000 (02:00 +0000)]
Merge "Don\'t use timestamps with all zero"
am: 9574e58027

* commit '9574e58027f8edeb539ecedf2988c1a302887807':
  Don't use timestamps with all zero

8 years agoMerge "Don\'t allow contact sharing by default for device not recognized as carkit...
Sanket Padawe [Tue, 17 Nov 2015 01:58:39 +0000 (01:58 +0000)]
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
am: 7bb34d7517

* commit '7bb34d7517cfef519a01e365c0da665852ac6b0b':
  Don't allow contact sharing by default for device not recognized as carkit.

8 years agoMerge "Don't use timestamps with all zero"
Eino-Ville Talvala [Tue, 17 Nov 2015 01:55:38 +0000 (01:55 +0000)]
Merge "Don't use timestamps with all zero"

8 years agoMerge "Don\'t allow contact sharing by default for device not recognized as carkit...
Sanket Padawe [Tue, 17 Nov 2015 01:43:08 +0000 (01:43 +0000)]
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.

8 years agoMerge "Don\'t allow contact sharing by default for device not recognized as carkit...
Sanket Padawe [Tue, 17 Nov 2015 01:43:07 +0000 (01:43 +0000)]
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.

8 years agoMerge "Don\'t allow contact sharing by default for device not recognized as carkit...
Sanket Padawe [Tue, 17 Nov 2015 01:33:24 +0000 (01:33 +0000)]
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.

8 years agoMerge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a
Deepanshu Gupta [Tue, 17 Nov 2015 01:28:58 +0000 (01:28 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am: 62302bd72a
am: 80bd5e6fd7

* commit '80bd5e6fd77eb93c5e7f29cce279f8194be4478b':
  WindowDecorActionBar name change fix.

8 years agoMerge "Don\'t allow contact sharing by default for device not recognized as carkit...
Sanket Padawe [Tue, 17 Nov 2015 01:23:47 +0000 (01:23 +0000)]
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.

8 years agoMerge "WindowDecorActionBar name change fix." into mnc-ub-dev
Deepanshu Gupta [Tue, 17 Nov 2015 01:17:27 +0000 (01:17 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev
am: 62302bd72a

* commit '62302bd72aaa6b0f934257447e8dcd636799180e':
  WindowDecorActionBar name change fix.

8 years agoMerge "WindowDecorActionBar name change fix." into mnc-ub-dev
Deepanshu Gupta [Tue, 17 Nov 2015 01:17:25 +0000 (01:17 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev
am: 62302bd72a

* commit '62302bd72aaa6b0f934257447e8dcd636799180e':
  WindowDecorActionBar name change fix.