OSDN Git Service

android-x86/frameworks-base.git
7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00...
Svet Ganov [Sat, 17 Dec 2016 04:04:31 +0000 (04:04 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00  -s ours am: c91845f753 am: 5034efbaf3 am: 0dca3a2fba
am: d10857f210

Change-Id: Ibb218fa69c45aa9404be89a7f5394023395417b1

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00...
Svet Ganov [Sat, 17 Dec 2016 03:54:05 +0000 (03:54 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00  -s ours am: c91845f753 am: 5034efbaf3
am: 0dca3a2fba

Change-Id: Ifd62443464dfa77b022552a1fada1288cfd42afe

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00...
Svet Ganov [Sat, 17 Dec 2016 03:42:58 +0000 (03:42 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00  -s ours am: c91845f753
am: 5034efbaf3

Change-Id: I22c38f921047ba7ecea5826701e3024de9a3d110

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00...
Svet Ganov [Sat, 17 Dec 2016 03:32:01 +0000 (03:32 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am: c3db570a00  -s ours
am: c91845f753

Change-Id: Ia85d2855dd8360b94fecb4bf6cd280ea4518d0e1

7 years ago[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
Svet Ganov [Sat, 17 Dec 2016 03:21:28 +0000 (03:21 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
am: c3db570a00  -s ours

Change-Id: I63b03cd2b057f95aefab23cdb4a29766ec304544

7 years agoMerge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc...
Android Build Merger (Role) [Sat, 17 Dec 2016 02:40:21 +0000 (02:40 +0000)]
Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 760d127583" into nyc-mr2-dev-plus-aosp

7 years agoMerge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc...
Android Build Merger (Role) [Sat, 17 Dec 2016 02:39:47 +0000 (02:39 +0000)]
Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789 am: 68b2be6105" into nyc-mr2-dev-plus-aosp

7 years agoMerge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1...
Mark Lu [Sat, 17 Dec 2016 02:39:39 +0000 (02:39 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789
am: 760d127583

Change-Id: I066d9f922e4e0b6baad2ce9b6be72e8435f7fc0a

7 years agoMerge "docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272...
Android Build Merger (Role) [Sat, 17 Dec 2016 02:39:13 +0000 (02:39 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed am: c9328c18a4" into nyc-mr2-dev-plus-aosp

7 years agoMerge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1...
Mark Lu [Sat, 17 Dec 2016 02:39:07 +0000 (02:39 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789
am: 68b2be6105

Change-Id: I51f8ea1b15702094cfb9b3761bbeaf3f3ed4022b

7 years agodocs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed
Mark Lu [Sat, 17 Dec 2016 02:38:23 +0000 (02:38 +0000)]
docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed
am: c9328c18a4

Change-Id: Ia793ab899b7c8a30e79244337efc39d779f9c92f

7 years agodocs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed
Mark Lu [Sat, 17 Dec 2016 02:37:58 +0000 (02:37 +0000)]
docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed
am: 2b77de3a44

Change-Id: Icc0b43048f14108b95a580f1aed3f595b16fc441

7 years agoMerge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1...
Mark Lu [Sat, 17 Dec 2016 02:29:43 +0000 (02:29 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739
am: 1474527789

Change-Id: I9ec8192fcf3bf3fa180e471648894d6b2e51abc9

7 years agoMerge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1...
Mark Lu [Sat, 17 Dec 2016 02:29:14 +0000 (02:29 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739
am: 1474527789

Change-Id: I0bf163508c4e936b2876cfdab59b47e1b3740f09

7 years agodocs: update description for BitmapFactory.Options#inBitmap am: a8f4286272
Mark Lu [Sat, 17 Dec 2016 02:28:31 +0000 (02:28 +0000)]
docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272
am: 58d24b22ed

Change-Id: I0420f0eba2d7d99b0c19aad72082b53dca3ac00e

7 years agodocs: update description for BitmapFactory.Options#inBitmap am: a8f4286272
Mark Lu [Sat, 17 Dec 2016 02:28:22 +0000 (02:28 +0000)]
docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272
am: 58d24b22ed

Change-Id: I8e3a23304924623e2379155dcc7df1f739a5b7f0

7 years agoMerge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
Mark Lu [Sat, 17 Dec 2016 02:19:55 +0000 (02:19 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
am: 88e64bb739

Change-Id: Idcaf2dabd54d5fc07cce825e44237ddb3fc0e51f

7 years agodocs: update description for BitmapFactory.Options#inBitmap
Mark Lu [Sat, 17 Dec 2016 02:19:51 +0000 (02:19 +0000)]
docs: update description for BitmapFactory.Options#inBitmap
am: a8f4286272

Change-Id: I163f1f5f8a9d688407aa7c0d76895bf18efa3430

7 years agoMerge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev
Justin Klaassen [Sat, 17 Dec 2016 02:11:02 +0000 (02:11 +0000)]
Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev
am: 868a859fd7

Change-Id: I3d9dfe36dbc2261e0390695940602769cfcc46cb

7 years agoReset BatteryStats when too large for clients to handle
Adam Lesinski [Sat, 17 Dec 2016 02:10:57 +0000 (02:10 +0000)]
Reset BatteryStats when too large for clients to handle
am: 45489787d7

Change-Id: Ie90ad79b71198d0fe0ead12048aec9bf6658a35a

7 years agoMerge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
Mark Lu [Sat, 17 Dec 2016 02:04:23 +0000 (02:04 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev

7 years agoMerge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev
Justin Klaassen [Sat, 17 Dec 2016 02:00:21 +0000 (02:00 +0000)]
Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev

7 years agoMerge "Increment vers of PrintRecommendationService" am: 08bff42ef4 am: a791fee2bc
Philip P. Moltmann [Sat, 17 Dec 2016 00:19:30 +0000 (00:19 +0000)]
Merge "Increment vers of PrintRecommendationService" am: 08bff42ef4 am: a791fee2bc
am: fbdcaa7278

Change-Id: I8596c48365a7e94f5f63aa99eebb3e55c127c891

7 years agoMerge changes Ic85892b4,I627e47c6 am: d995c94426 am: d49df21f80
Vitalii Tomkiv [Sat, 17 Dec 2016 00:17:41 +0000 (00:17 +0000)]
Merge changes Ic85892b4,I627e47c6 am: d995c94426 am: d49df21f80
am: 82160ca083

Change-Id: I44ec8e564dee2548695842871336ceb885c214b1

7 years agoMake sure Zygote is running at process priority 0 after VM has started. am: 1e52ce48a...
Vitalii Tomkiv [Sat, 17 Dec 2016 00:16:55 +0000 (00:16 +0000)]
Make sure Zygote is running at process priority 0 after VM has started. am: 1e52ce48a6 am: 7f797cc54c
am: 9dd81c9170

Change-Id: I5f88d020a668f94c5dd0c08c1d589ba748d4451c

7 years agoRevert "Add boost to increase the load on newly-forked zygote processes." am: 8175f09...
Todd Kjos [Sat, 17 Dec 2016 00:16:11 +0000 (00:16 +0000)]
Revert "Add boost to increase the load on newly-forked zygote processes." am: 8175f0955a am: 501875bbe8  -s ours
am: 391d3e1aad

Change-Id: Ic3cffb9882cc99b8941aa3f8275776d38db604cf

7 years agoMerge "Increment vers of PrintRecommendationService" am: 08bff42ef4
Philip P. Moltmann [Sat, 17 Dec 2016 00:03:28 +0000 (00:03 +0000)]
Merge "Increment vers of PrintRecommendationService" am: 08bff42ef4
am: a791fee2bc

Change-Id: I2a39d30b3627872d996786b276430982eba92b60

7 years agoMerge changes Ic85892b4,I627e47c6 am: d995c94426
Vitalii Tomkiv [Sat, 17 Dec 2016 00:01:23 +0000 (00:01 +0000)]
Merge changes Ic85892b4,I627e47c6 am: d995c94426
am: d49df21f80

Change-Id: Ia916b1a329769a22bf3831dec03c753018c2e24c

7 years agoMake sure Zygote is running at process priority 0 after VM has started. am: 1e52ce48a6
Vitalii Tomkiv [Sat, 17 Dec 2016 00:00:34 +0000 (00:00 +0000)]
Make sure Zygote is running at process priority 0 after VM has started. am: 1e52ce48a6
am: 7f797cc54c

Change-Id: Ic5f00cb15b996317fdf6ac8aa4053c79426f1e23

7 years agoRevert "Add boost to increase the load on newly-forked zygote processes." am: 8175f0955a
Todd Kjos [Fri, 16 Dec 2016 23:59:45 +0000 (23:59 +0000)]
Revert "Add boost to increase the load on newly-forked zygote processes." am: 8175f0955a
am: 501875bbe8  -s ours

Change-Id: Iaa49788db807d3d1965e6e85e10f6659e760146e

7 years agoMerge "Fixing issue in current and max duration calculations." into nyc-mr2-dev
Kweku Adams [Fri, 16 Dec 2016 23:51:21 +0000 (23:51 +0000)]
Merge "Fixing issue in current and max duration calculations." into nyc-mr2-dev
am: 1decad5e8c

Change-Id: I585639d10d39b3e6aecf3f230a307f337f54a93d

7 years agoFixing issue in current and max duration calculations.
Kweku Adams [Fri, 16 Dec 2016 23:51:17 +0000 (23:51 +0000)]
Fixing issue in current and max duration calculations.
am: c6bd4243a4

Change-Id: I109e0599a631de20d28723bb9ad714c0aedb2fac

7 years agodocs: update description for BitmapFactory.Options#inBitmap
Mark Lu [Fri, 16 Dec 2016 23:43:27 +0000 (15:43 -0800)]
docs: update description for BitmapFactory.Options#inBitmap

bug: 18730109
Change-Id: Iab062d41af3a32208d3500179d3737278a035188

7 years agoMerge "Fixing issue in current and max duration calculations." into nyc-mr2-dev
Kweku Adams [Fri, 16 Dec 2016 23:37:17 +0000 (23:37 +0000)]
Merge "Fixing issue in current and max duration calculations." into nyc-mr2-dev

7 years agoMerge "Increment vers of PrintRecommendationService"
Philip P. Moltmann [Fri, 16 Dec 2016 22:51:11 +0000 (22:51 +0000)]
Merge "Increment vers of PrintRecommendationService"
am: 08bff42ef4

Change-Id: Ie98d6f58dbb4d29e27200aa1b9829372930a0fa3

7 years agoMerge "Assist app is not launched when long-pressing on Home key" into nyc-mr2-dev
Adrian Roos [Fri, 16 Dec 2016 22:37:12 +0000 (22:37 +0000)]
Merge "Assist app is not launched when long-pressing on Home key" into nyc-mr2-dev
am: 31b96311bf

Change-Id: Id4bfb36551b47a733acb21ede4cc587840496b54

7 years agoAssist app is not launched when long-pressing on Home key
Kaori Katou [Fri, 16 Dec 2016 22:37:06 +0000 (22:37 +0000)]
Assist app is not launched when long-pressing on Home key
am: ed7bf5eecc

Change-Id: I84d53841eaa9d2e28447a891ad58460fbf24b364

7 years agoMerge "Increment vers of PrintRecommendationService"
Philip P. Moltmann [Fri, 16 Dec 2016 22:36:10 +0000 (22:36 +0000)]
Merge "Increment vers of PrintRecommendationService"

7 years agoMerge changes Ic85892b4,I627e47c6
Vitalii Tomkiv [Fri, 16 Dec 2016 22:35:54 +0000 (22:35 +0000)]
Merge changes Ic85892b4,I627e47c6
am: d995c94426

Change-Id: If036b0f5b8497667a9c2a916ec74d482def2aed5

7 years agoMake sure Zygote is running at process priority 0 after VM has started.
Vitalii Tomkiv [Fri, 16 Dec 2016 22:35:49 +0000 (22:35 +0000)]
Make sure Zygote is running at process priority 0 after VM has started.
am: 1e52ce48a6

Change-Id: Ia1f511d294a9c718534a4a0b8ad747ef58a98b52

7 years agoMerge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev
Junda Liu [Fri, 16 Dec 2016 22:35:19 +0000 (22:35 +0000)]
Merge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev
am: 565fcb4b95

Change-Id: Ia58e19c82426d85b707bf98612f0b08bb1b4ecf2

7 years agoAdd carrier config key KEY_EDITABLE_TETHER_APN_BOOL.
Junda Liu [Fri, 16 Dec 2016 22:35:13 +0000 (22:35 +0000)]
Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL.
am: 6bb22e3de2

Change-Id: I8228c805c69189966b0b4f12d11ab7c5564766c4

7 years agoRevert "Add boost to increase the load on newly-forked zygote processes."
Todd Kjos [Fri, 16 Dec 2016 22:35:08 +0000 (22:35 +0000)]
Revert "Add boost to increase the load on newly-forked zygote processes."
am: 8175f0955a

Change-Id: I6f61c45f690647c860e0ceb140857e53bc253f00

7 years agoMerge "Assist app is not launched when long-pressing on Home key" into nyc-mr2-dev
Adrian Roos [Fri, 16 Dec 2016 22:32:31 +0000 (22:32 +0000)]
Merge "Assist app is not launched when long-pressing on Home key" into nyc-mr2-dev

7 years agoMerge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev
Junda Liu [Fri, 16 Dec 2016 22:24:16 +0000 (22:24 +0000)]
Merge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev

7 years agoMerge changes Ic85892b4,I627e47c6
Treehugger Robot [Fri, 16 Dec 2016 22:20:24 +0000 (22:20 +0000)]
Merge changes Ic85892b4,I627e47c6

* changes:
  Make sure Zygote is running at process priority 0 after VM has started.
  Revert "Add boost to increase the load on newly-forked zygote processes."

7 years agoMerge "Add the webview zygote socket to the zygote whitelist." am: f8882ae834 am...
Torne (Richard Coles) [Fri, 16 Dec 2016 21:52:40 +0000 (21:52 +0000)]
Merge "Add the webview zygote socket to the zygote whitelist." am: f8882ae834 am: bc801c663e
am: e19d6d414d

Change-Id: I3e8867f2ce74d03a304201b68f06bfd70853c2fa

7 years agoMerge "Add the webview zygote socket to the zygote whitelist." am: f8882ae834
Torne (Richard Coles) [Fri, 16 Dec 2016 21:45:40 +0000 (21:45 +0000)]
Merge "Add the webview zygote socket to the zygote whitelist." am: f8882ae834
am: bc801c663e

Change-Id: If1edf0bf30e8359912235c788a49131b528efb30

7 years agoMerge "Add the webview zygote socket to the zygote whitelist."
Torne (Richard Coles) [Fri, 16 Dec 2016 21:38:17 +0000 (21:38 +0000)]
Merge "Add the webview zygote socket to the zygote whitelist."
am: f8882ae834

Change-Id: I02d08d8f91567b8bd6709137f98f87550c13f145

7 years agoMerge "Add the webview zygote socket to the zygote whitelist."
Treehugger Robot [Fri, 16 Dec 2016 21:25:34 +0000 (21:25 +0000)]
Merge "Add the webview zygote socket to the zygote whitelist."

7 years agoMerge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp
Todd Kjos [Fri, 16 Dec 2016 21:14:16 +0000 (21:14 +0000)]
Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp
am: 85a19e86d0

Change-Id: I240a2ae5d97e275d3660a7a2d5e9f2e5e222e813

7 years agoRevert "Add boost to increase the load on newly-forked zygote processes."
Todd Kjos [Fri, 16 Dec 2016 21:14:13 +0000 (21:14 +0000)]
Revert "Add boost to increase the load on newly-forked zygote processes."
am: 80fb0b0a44

Change-Id: Iaec14c37eb4bdf685d47ff28d7caa652bb1057dc

7 years agoMake sure Zygote is running at process priority 0 after VM has started.
Vitalii Tomkiv [Fri, 16 Dec 2016 21:13:35 +0000 (21:13 +0000)]
Make sure Zygote is running at process priority 0 after VM has started.
am: 5cbce85fd3

Change-Id: If47c73fe85b16337e2c60715edb1861e7ef244d3

7 years agoMerge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp
TreeHugger Robot [Fri, 16 Dec 2016 21:02:57 +0000 (21:02 +0000)]
Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp

* changes:
  Revert "Add boost to increase the load on newly-forked zygote processes."
  Make sure Zygote is running at process priority 0 after VM has started.

7 years agoIncrement vers of PrintRecommendationService
Philip P. Moltmann [Fri, 16 Dec 2016 20:51:49 +0000 (12:51 -0800)]
Increment vers of PrintRecommendationService

as the Samsung PlugIn was updated.

Test: Let the service generate some recommendations
Change-Id: Ief7ea4f1dddfee92aa9fa83ff53b296ced0e3b55

7 years agoMerge "Set com.android.networkrecommendation as the default network recommendation...
Joe LaPenna [Fri, 16 Dec 2016 20:51:56 +0000 (20:51 +0000)]
Merge "Set com.android.networkrecommendation as the default network recommendation service." am: 0b4df21aac am: 4c3b2f5f99
am: de89c74f51

Change-Id: Iac44d02fa3fc12ca3d375c60a98bad67d0dc21c9

7 years agoMerge "Set com.android.networkrecommendation as the default network recommendation...
Joe LaPenna [Fri, 16 Dec 2016 20:44:05 +0000 (20:44 +0000)]
Merge "Set com.android.networkrecommendation as the default network recommendation service." am: 0b4df21aac
am: 4c3b2f5f99

Change-Id: I7ee10f1336c48969fa64cd6f5a45087027a2e8c3

7 years agoMerge "Set com.android.networkrecommendation as the default network recommendation...
Joe LaPenna [Fri, 16 Dec 2016 20:35:53 +0000 (20:35 +0000)]
Merge "Set com.android.networkrecommendation as the default network recommendation service."
am: 0b4df21aac

Change-Id: Ia955fd0d980a5ddcdb5ae6880c7a380251819f44

7 years agoMerge "Set com.android.networkrecommendation as the default network recommendation...
Treehugger Robot [Fri, 16 Dec 2016 20:23:47 +0000 (20:23 +0000)]
Merge "Set com.android.networkrecommendation as the default network recommendation service."

7 years agoMerge changes Ia4bec085,I59095f2a am: 733d007279 am: 3d17e17b0a
Andreas Gampe [Fri, 16 Dec 2016 19:55:48 +0000 (19:55 +0000)]
Merge changes Ia4bec085,I59095f2a am: 733d007279 am: 3d17e17b0a
am: 2260a6ef9a

Change-Id: I5fd2ded2e619178487606fb6cae91401b92448d8

7 years agoEnable logwrapper functionality on user builds am: 0ca16fa584 am: db05d4b4ed
Tamas Berghammer [Fri, 16 Dec 2016 19:54:58 +0000 (19:54 +0000)]
Enable logwrapper functionality on user builds am: 0ca16fa584 am: db05d4b4ed
am: ed8757a761

Change-Id: I0f27f6aeb58690addb1c5f7978047ccb8d73ab84

7 years agoZygote: Add invoke-with to zygote protocol am: b8f7c351b9 am: 45c2fffc52
Tamas Berghammer [Fri, 16 Dec 2016 19:54:11 +0000 (19:54 +0000)]
Zygote: Add invoke-with to zygote protocol am: b8f7c351b9 am: 45c2fffc52
am: d71bb300e6

Change-Id: Ied54640c44ade52abd6a905526ba7789be14a332

7 years agoMerge changes Ia4bec085,I59095f2a am: 733d007279
Andreas Gampe [Fri, 16 Dec 2016 19:47:42 +0000 (19:47 +0000)]
Merge changes Ia4bec085,I59095f2a am: 733d007279
am: 3d17e17b0a

Change-Id: I835f1efcf985c73db9ddb5ffe15d80842afdf6e2

7 years agoEnable logwrapper functionality on user builds am: 0ca16fa584
Tamas Berghammer [Fri, 16 Dec 2016 19:46:55 +0000 (19:46 +0000)]
Enable logwrapper functionality on user builds am: 0ca16fa584
am: db05d4b4ed

Change-Id: Ic6c3395f9965657a7f9abe580867eeb81b59ed88

7 years agoZygote: Add invoke-with to zygote protocol am: b8f7c351b9
Tamas Berghammer [Fri, 16 Dec 2016 19:46:03 +0000 (19:46 +0000)]
Zygote: Add invoke-with to zygote protocol am: b8f7c351b9
am: 45c2fffc52

Change-Id: I90999d84c9694bfeebea8d2c2d95d1d545bac7e8

7 years agoMerge changes Ia4bec085,I59095f2a
Andreas Gampe [Fri, 16 Dec 2016 19:38:43 +0000 (19:38 +0000)]
Merge changes Ia4bec085,I59095f2a
am: 733d007279

Change-Id: Id0f0746af66b4f2e0352e2a0dde9d3f27e23f84c

7 years agoEnable logwrapper functionality on user builds
Tamas Berghammer [Fri, 16 Dec 2016 19:38:38 +0000 (19:38 +0000)]
Enable logwrapper functionality on user builds
am: 0ca16fa584

Change-Id: Ic18991f9a59f05356fcbcc65acc79be43fc68542

7 years agoZygote: Add invoke-with to zygote protocol
Tamas Berghammer [Fri, 16 Dec 2016 19:37:57 +0000 (19:37 +0000)]
Zygote: Add invoke-with to zygote protocol
am: b8f7c351b9

Change-Id: I79db6f759b02ef612364fc857102615d51900cd9

7 years agoRevert "Add boost to increase the load on newly-forked zygote processes."
Todd Kjos [Wed, 7 Sep 2016 01:25:46 +0000 (18:25 -0700)]
Revert "Add boost to increase the load on newly-forked zygote processes."

This reverts commit 6d43a861d01ef48f37c69f96346a13d23164a585.

(cherry picked from commit 0f2ded62ae3d88ddb732df182c3bfee3e2729018)

Test: m
Test: Device boots
Change-Id: I627e47c6ead4ce2d2bffa923a32a56d06c022df7

7 years agoMerge "Add config_demoModePassword" into nyc-mr2-dev
Christine Franks [Fri, 16 Dec 2016 19:31:22 +0000 (19:31 +0000)]
Merge "Add config_demoModePassword" into nyc-mr2-dev
am: ee3af13cf2

Change-Id: I90badd6bc1069e015331c697bbde912465e918c1

7 years agoReset BatteryStats when too large for clients to handle
Adam Lesinski [Fri, 16 Dec 2016 07:45:17 +0000 (23:45 -0800)]
Reset BatteryStats when too large for clients to handle

When BatteryStats history is too large, the Settings app crashes.
Reset the battery stats by marking an *OVERFLOW* event at the
beginning of the newly reset history.

This seems to happen in Retail mode when the devices are on charger
for an extended period of time and accumulate a sufficiently large
history. Resetting makes sense because the phone is most likely
charged and will reset anyways when unplugged.
Bug: 32540341
Test: Manual

Change-Id: I8c2892458b5d9ce64b1c44aa2e2a000340e71e63

7 years agoMerge changes Ia4bec085,I59095f2a
Andreas Gampe [Fri, 16 Dec 2016 19:24:12 +0000 (19:24 +0000)]
Merge changes Ia4bec085,I59095f2a

* changes:
  Enable logwrapper functionality on user builds
  Zygote: Add invoke-with to zygote protocol

7 years agoMake sure Zygote is running at process priority 0 after VM has started.
Vitalii Tomkiv [Thu, 19 May 2016 00:43:02 +0000 (17:43 -0700)]
Make sure Zygote is running at process priority 0 after VM has started.

Boosting up zygote priority before VM startup, saves ~450ms of boot time
for N9, 180ms for Nexus 5X.

(cherry picked from commit 5d551a5ac3d13706f62a86842ff6851e1d25213b)

Bug: 28866384
Test: m
Test: Device boots
Change-Id: Ic85892b408e15bbc1de7ce706f113f23974fe478

7 years agoAdd config_demoModePassword
Christine Franks [Fri, 16 Dec 2016 19:17:33 +0000 (19:17 +0000)]
Add config_demoModePassword
am: 566525c6bb

Change-Id: Idc99f301b936be1f1a8a70b33f2ff02f396f9da0

7 years agoMerge "Add config_demoModePassword" into nyc-mr2-dev
Christine Franks [Fri, 16 Dec 2016 19:10:56 +0000 (19:10 +0000)]
Merge "Add config_demoModePassword" into nyc-mr2-dev

7 years agoMerge "Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev am: 6ce17fb07...
Android Build Merger (Role) [Fri, 16 Dec 2016 19:03:05 +0000 (19:03 +0000)]
Merge "Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev am: 6ce17fb072" into nyc-mr2-dev-plus-aosp

7 years agoMerge "FalsingLog: Fix false positive Log.wtfs am: 64f87bad12" into nyc-mr2-dev-plus...
Android Build Merger (Role) [Fri, 16 Dec 2016 19:02:46 +0000 (19:02 +0000)]
Merge "FalsingLog: Fix false positive Log.wtfs am: 64f87bad12" into nyc-mr2-dev-plus-aosp

7 years agoMerge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev
Adrian Roos [Fri, 16 Dec 2016 19:02:05 +0000 (19:02 +0000)]
Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev
am: 6ce17fb072

Change-Id: Id22b291757e72e7aa2e56e1f2ed65f7dcb7b00b0

7 years agoFalsingLog: Fix false positive Log.wtfs
Adrian Roos [Fri, 16 Dec 2016 19:01:58 +0000 (19:01 +0000)]
FalsingLog: Fix false positive Log.wtfs
am: 64f87bad12

Change-Id: Ief66fe0f832737f733d728a8b0533bcabfc3c57c

7 years agoMerge "NativeLibraryHelper: Minor fixes" am: c1536f0d10 am: 109a82d7e3
Andreas Gampe [Fri, 16 Dec 2016 19:01:52 +0000 (19:01 +0000)]
Merge "NativeLibraryHelper: Minor fixes" am: c1536f0d10 am: 109a82d7e3
am: 77274269ba

Change-Id: Id450c7da8d22390c0e7506ed9058bdbf261d3ef4

7 years agoAdd the webview zygote socket to the zygote whitelist.
Torne (Richard Coles) [Fri, 23 Sep 2016 15:41:42 +0000 (16:41 +0100)]
Add the webview zygote socket to the zygote whitelist.

Allow the webview zygote socket to be open at time of fork, so that
webview renderers can be forked successfully.

(cherry picked from commit a7fcb2bc2a65da3743914727adb0df89a4eb0b66)

Test: WebView functions correctly with multiprocess dev setting enabled
Bug: 21643067
Change-Id: I312846433a43a8e4548cb2f98b96b56acf9f5333

7 years agoMerge "NativeLibraryHelper: Minor fixes" am: c1536f0d10
Andreas Gampe [Fri, 16 Dec 2016 18:53:01 +0000 (18:53 +0000)]
Merge "NativeLibraryHelper: Minor fixes" am: c1536f0d10
am: 109a82d7e3

Change-Id: I362df209d24a9e2602da1b8cf72e4ea63b5e7f60

7 years agoAssist app is not launched when long-pressing on Home key
Kaori Katou [Thu, 4 Aug 2016 08:11:07 +0000 (17:11 +0900)]
Assist app is not launched when long-pressing on Home key

To get Assist component and launch it correctly,
The proper userId should be passed
to AssistUtils#getAssistComponentForUser().

Bug: 30777883
Test: manual - install LegacyAssistant app and long-press on Home key

Change-Id: I9f18ffdd9fc893235d77ed8145a765736a679478
(cherry picked from commit 70554e01c64101bb7e5a511be328ae774a6f451c)

7 years agoMerge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev
Adrian Roos [Fri, 16 Dec 2016 18:49:53 +0000 (18:49 +0000)]
Merge "FalsingLog: Fix false positive Log.wtfs" into nyc-mr2-dev

7 years agoMerge "NativeLibraryHelper: Minor fixes"
Andreas Gampe [Fri, 16 Dec 2016 18:44:54 +0000 (18:44 +0000)]
Merge "NativeLibraryHelper: Minor fixes"
am: c1536f0d10

Change-Id: I81e69315c5f74341ddf3472263462f8fdf935797

7 years agoSet com.android.networkrecommendation as the default network recommendation service.
Joe LaPenna [Thu, 8 Dec 2016 00:32:51 +0000 (16:32 -0800)]
Set com.android.networkrecommendation as the default network recommendation service.

BUG: 33224286
Test: Build image and verified the config value was set.

Change-Id: Id657c28753eaa6050bb2d82e45f70f694ce7e7dd
Merged-In: Id657c28753eaa6050bb2d82e45f70f694ce7e7dd

7 years agoMerge "NativeLibraryHelper: Minor fixes"
Treehugger Robot [Fri, 16 Dec 2016 18:31:25 +0000 (18:31 +0000)]
Merge "NativeLibraryHelper: Minor fixes"

7 years agoMake sure Zygote is running at process priority 0 after VM has started.
Vitalii Tomkiv [Thu, 19 May 2016 00:43:02 +0000 (17:43 -0700)]
Make sure Zygote is running at process priority 0 after VM has started.

Boosting up zygote priority before VM startup, saves ~450ms of boot time
for N9, 180ms for Nexus 5X.

(cherry picked from commit 5d551a5ac3d13706f62a86842ff6851e1d25213b)

Bug: 28866384
Test: m
Test: Device boots
Change-Id: Ic85892b408e15bbc1de7ce706f113f23974fe478

7 years agoRevert "Add boost to increase the load on newly-forked zygote processes."
Todd Kjos [Wed, 7 Sep 2016 01:25:46 +0000 (18:25 -0700)]
Revert "Add boost to increase the load on newly-forked zygote processes."

This reverts commit 6d43a861d01ef48f37c69f96346a13d23164a585.

(cherry picked from commit 0f2ded62ae3d88ddb732df182c3bfee3e2729018)

Test: m
Test: Device boots
Change-Id: I627e47c6ead4ce2d2bffa923a32a56d06c022df7

7 years agoEnable logwrapper functionality on user builds
Tamas Berghammer [Fri, 11 Nov 2016 16:08:26 +0000 (16:08 +0000)]
Enable logwrapper functionality on user builds

When an app is debuggable, check whether a script called "wrap.sh" exists
in the app's native library directory. If so, start the app using the
invoke-with functionality over the script. Weaken the invoke-with check
on the zygote side to allow the functionality for debuggable apps.

The goal of the functionality is to make malloc debug, strace and other
similar tools available for NDK based application developers.

Bug: 33668201
Test: manual - debug malloc can be enabled using the new feature
Change-Id: Ia4bec0854cf4dc08446f1671494200f54ef366ee

7 years agoZygote: Add invoke-with to zygote protocol
Tamas Berghammer [Fri, 11 Nov 2016 16:08:26 +0000 (16:08 +0000)]
Zygote: Add invoke-with to zygote protocol

Add "--invoke-with" to the zygote connection protocol. It was
already understood as an argument by the zygote.

Bug: 33668201
Test: m
Change-Id: I59095f2ac542aadff78a7ff1dded86cf5f192707

7 years agoNativeLibraryHelper: Minor fixes
Andreas Gampe [Fri, 16 Dec 2016 00:12:39 +0000 (16:12 -0800)]
NativeLibraryHelper: Minor fixes

Skip over directories when iterating library files. Ensure correct
temp file naming.

Bug: 33668201
Test: m
Test: Device boots
Test: Manual: Install debuggable and non-debuggable apps
Change-Id: I2f0547e965d9a0c478e333a13b2db02f4eedac2c

7 years agoMerge "Notify user when user fails to connect to the network." into nyc-mr2-dev
Pankaj Kanwar [Fri, 16 Dec 2016 16:15:10 +0000 (16:15 +0000)]
Merge "Notify user when user fails to connect to the network." into nyc-mr2-dev
am: 99291e8f35

Change-Id: I8d340854a4f46ddff8e1432396b9110e438215eb

7 years agoNotify user when user fails to connect to the network.
pkanwar [Fri, 16 Dec 2016 16:15:03 +0000 (16:15 +0000)]
Notify user when user fails to connect to the network.
am: 2b7a8a9ab0

Change-Id: I04401c95fa9014e6e988ca0e80de8289ce486bdc

7 years agoMerge "Notify user when user fails to connect to the network." into nyc-mr2-dev
Pankaj Kanwar [Fri, 16 Dec 2016 16:00:12 +0000 (16:00 +0000)]
Merge "Notify user when user fails to connect to the network." into nyc-mr2-dev

7 years agoMerge "Make TelephonyManager APIs public:" am: 441bfc6718 am: 104a5c7a34
Polina Bondarenko [Fri, 16 Dec 2016 10:53:30 +0000 (10:53 +0000)]
Merge "Make TelephonyManager APIs public:" am: 441bfc6718 am: 104a5c7a34
am: bab9a7e66e

Change-Id: Ie57e56db0d87968524bc7dc39b2d1061c4ec88b3

7 years agoMerge "Make TelephonyManager APIs public:" am: 441bfc6718
Polina Bondarenko [Fri, 16 Dec 2016 10:45:03 +0000 (10:45 +0000)]
Merge "Make TelephonyManager APIs public:" am: 441bfc6718
am: 104a5c7a34

Change-Id: I0d234fd2539a3a9ec58c820a7a7428430aa2255a

7 years agoMerge "Make TelephonyManager APIs public:"
Polina Bondarenko [Fri, 16 Dec 2016 10:37:21 +0000 (10:37 +0000)]
Merge "Make TelephonyManager APIs public:"
am: 441bfc6718

Change-Id: I968c8232c746027123beac6481161019e1dc64a5

7 years agoMerge "Make TelephonyManager APIs public:"
Treehugger Robot [Fri, 16 Dec 2016 10:29:03 +0000 (10:29 +0000)]
Merge "Make TelephonyManager APIs public:"

7 years agoMerge "Move libandroid_runtime headers into frameworks/base/core/jni" am: 541845908c...
Colin Cross [Fri, 16 Dec 2016 09:14:53 +0000 (09:14 +0000)]
Merge "Move libandroid_runtime headers into frameworks/base/core/jni" am: 541845908c am: 29d7284285
am: 2d9b7015a1

Change-Id: I333ebefc01b52bf2121617281a6fb114c1533570