280256 Commits

Author SHA1 Message Date
Mark Lu
ce2d5723cb Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739 am: 1474527789
am: 68b2be6105

Change-Id: I51f8ea1b15702094cfb9b3761bbeaf3f3ed4022b
2016-12-17 02:39:07 +00:00
Mark Lu
1c64c32051 docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed
am: c9328c18a4

Change-Id: Ia793ab899b7c8a30e79244337efc39d779f9c92f
2016-12-17 02:38:23 +00:00
Mark Lu
f34e9fc48d docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272 am: 58d24b22ed
am: 2b77de3a44

Change-Id: Icc0b43048f14108b95a580f1aed3f595b16fc441
2016-12-17 02:37:58 +00:00
Mark Lu
760d127583 Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739
am: 1474527789

Change-Id: I9ec8192fcf3bf3fa180e471648894d6b2e51abc9
2016-12-17 02:29:43 +00:00
Mark Lu
68b2be6105 Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am: 88e64bb739
am: 1474527789

Change-Id: I0bf163508c4e936b2876cfdab59b47e1b3740f09
2016-12-17 02:29:14 +00:00
Mark Lu
c9328c18a4 docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272
am: 58d24b22ed

Change-Id: I0420f0eba2d7d99b0c19aad72082b53dca3ac00e
2016-12-17 02:28:31 +00:00
Mark Lu
2b77de3a44 docs: update description for BitmapFactory.Options#inBitmap am: a8f4286272
am: 58d24b22ed

Change-Id: I8e3a23304924623e2379155dcc7df1f739a5b7f0
2016-12-17 02:28:22 +00:00
Joe Fernandez
b9bd6cca9e docs: Add deprecation message for the developer.android.com docs
Change-Id: Ia091df49099482696abbc3a596cf1787ca904d67
2016-12-16 18:20:56 -08:00
Mark Lu
1474527789 Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev
am: 88e64bb739

Change-Id: Idcaf2dabd54d5fc07cce825e44237ddb3fc0e51f
2016-12-17 02:19:55 +00:00
Mark Lu
58d24b22ed docs: update description for BitmapFactory.Options#inBitmap
am: a8f4286272

Change-Id: I163f1f5f8a9d688407aa7c0d76895bf18efa3430
2016-12-17 02:19:51 +00:00
Justin Klaassen
0169932c51 Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev
am: 868a859fd7

Change-Id: I3d9dfe36dbc2261e0390695940602769cfcc46cb
2016-12-17 02:11:02 +00:00
Adam Lesinski
66c7e9c20e Reset BatteryStats when too large for clients to handle
am: 45489787d7

Change-Id: Ie90ad79b71198d0fe0ead12048aec9bf6658a35a
2016-12-17 02:10:57 +00:00
Michael Rosenfeld
1876d82450 Merge "Clean up local hprofs"
am: 9ab94e15c7

Change-Id: Ie99cc29ef321ec7276535b28ae4b7eaf828410da
2016-12-17 02:10:53 +00:00
Mark Lu
88e64bb739 Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev 2016-12-17 02:04:28 +00:00
Justin Klaassen
868a859fd7 Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev 2016-12-17 02:00:26 +00:00
Treehugger Robot
9ab94e15c7 Merge "Clean up local hprofs" 2016-12-17 01:54:34 +00:00
Michael Rosenfeld
2b62809c70 Clean up local hprofs
* After use
* Upon failure

Test: manual tool use
Change-Id: I2669e190c3792522c121158ea2aec84fe577c9e3
2016-12-16 16:24:29 -08:00
Philip P. Moltmann
72c7cce18f Merge "Increment vers of PrintRecommendationService" am: 08bff42ef4 am: a791fee2bc
am: fbdcaa7278

Change-Id: I8596c48365a7e94f5f63aa99eebb3e55c127c891
2016-12-17 00:19:30 +00:00
Vitalii Tomkiv
f50eacf203 Merge changes Ic85892b4,I627e47c6 am: d995c94426 am: d49df21f80
am: 82160ca083

Change-Id: I44ec8e564dee2548695842871336ceb885c214b1
2016-12-17 00:17:41 +00:00
Vitalii Tomkiv
9d6fd9d734 Make sure Zygote is running at process priority 0 after VM has started. am: 1e52ce48a6 am: 7f797cc54c
am: 9dd81c9170

Change-Id: I5f88d020a668f94c5dd0c08c1d589ba748d4451c
2016-12-17 00:16:55 +00:00
Todd Kjos
e9e98f9cea Revert "Add boost to increase the load on newly-forked zygote processes." am: 8175f0955a am: 501875bbe8 -s ours
am: 391d3e1aad

Change-Id: Ic3cffb9882cc99b8941aa3f8275776d38db604cf
2016-12-17 00:16:11 +00:00
Philip P. Moltmann
fbdcaa7278 Merge "Increment vers of PrintRecommendationService" am: 08bff42ef4
am: a791fee2bc

Change-Id: I2a39d30b3627872d996786b276430982eba92b60
2016-12-17 00:03:28 +00:00
Vitalii Tomkiv
82160ca083 Merge changes Ic85892b4,I627e47c6 am: d995c94426
am: d49df21f80

Change-Id: Ia916b1a329769a22bf3831dec03c753018c2e24c
2016-12-17 00:01:23 +00:00
Vitalii Tomkiv
9dd81c9170 Make sure Zygote is running at process priority 0 after VM has started. am: 1e52ce48a6
am: 7f797cc54c

Change-Id: Ic5f00cb15b996317fdf6ac8aa4053c79426f1e23
2016-12-17 00:00:34 +00:00
Todd Kjos
391d3e1aad Revert "Add boost to increase the load on newly-forked zygote processes." am: 8175f0955a
am: 501875bbe8  -s ours

Change-Id: Iaa49788db807d3d1965e6e85e10f6659e760146e
2016-12-16 23:59:45 +00:00
Kweku Adams
05cf63f3d7 Merge "Fixing issue in current and max duration calculations." into nyc-mr2-dev
am: 1decad5e8c

Change-Id: I585639d10d39b3e6aecf3f230a307f337f54a93d
2016-12-16 23:51:21 +00:00
Kweku Adams
c9430110da Fixing issue in current and max duration calculations.
am: c6bd4243a4

Change-Id: I109e0599a631de20d28723bb9ad714c0aedb2fac
2016-12-16 23:51:17 +00:00
Mark Lu
a8f4286272 docs: update description for BitmapFactory.Options#inBitmap
bug: 18730109
Change-Id: Iab062d41af3a32208d3500179d3737278a035188
2016-12-16 15:43:27 -08:00
Kweku Adams
1decad5e8c Merge "Fixing issue in current and max duration calculations." into nyc-mr2-dev 2016-12-16 23:37:21 +00:00
Marie Janssen
ff0d3e1c8d Merge "Bluetooth: fix issues re-enabling after crash"
am: e2c22e38d5

Change-Id: I6722c1b8d839918e2ce7918f5f7b8583a14c1ded
2016-12-16 23:07:42 +00:00
Marie Janssen
e2c22e38d5 Merge "Bluetooth: fix issues re-enabling after crash" 2016-12-16 22:56:59 +00:00
Philip P. Moltmann
a791fee2bc Merge "Increment vers of PrintRecommendationService"
am: 08bff42ef4

Change-Id: Ie98d6f58dbb4d29e27200aa1b9829372930a0fa3
2016-12-16 22:51:11 +00:00
Marie Janssen
ed50bbcffd Bluetooth: fix issues re-enabling after crash
When Bluetooth crashes, sometimes an LE app restarts it before
ActivityManager gets a chance.  In this case, the Bluetooth manager
would assume the state should be LE only and did not continue to fully
enabled.

Luckily in this case the persisted system state is also ON.  Use the
persisted state as information about whether we should be fully enabled.

Test: basic sanity check, forced crash of BT
Bug: 33632976
Change-Id: I546d7abccb82a26fcca2eb70d6d7c76e9510404e
2016-12-16 22:50:13 +00:00
Adrian Roos
ca504aae64 Merge "Assist app is not launched when long-pressing on Home key" into nyc-mr2-dev
am: 31b96311bf

Change-Id: Id4bfb36551b47a733acb21ede4cc587840496b54
2016-12-16 22:37:12 +00:00
Kaori Katou
ea00cbb776 Assist app is not launched when long-pressing on Home key
am: ed7bf5eecc

Change-Id: I84d53841eaa9d2e28447a891ad58460fbf24b364
2016-12-16 22:37:06 +00:00
Philip P. Moltmann
08bff42ef4 Merge "Increment vers of PrintRecommendationService" 2016-12-16 22:36:11 +00:00
Vitalii Tomkiv
d49df21f80 Merge changes Ic85892b4,I627e47c6
am: d995c94426

Change-Id: If036b0f5b8497667a9c2a916ec74d482def2aed5
2016-12-16 22:35:54 +00:00
Vitalii Tomkiv
7f797cc54c Make sure Zygote is running at process priority 0 after VM has started.
am: 1e52ce48a6

Change-Id: Ia1f511d294a9c718534a4a0b8ad747ef58a98b52
2016-12-16 22:35:49 +00:00
Junda Liu
b5ee93791a Merge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev
am: 565fcb4b95

Change-Id: Ia58e19c82426d85b707bf98612f0b08bb1b4ecf2
2016-12-16 22:35:19 +00:00
Junda Liu
0c62aa5f10 Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL.
am: 6bb22e3de2

Change-Id: I8228c805c69189966b0b4f12d11ab7c5564766c4
2016-12-16 22:35:13 +00:00
Todd Kjos
501875bbe8 Revert "Add boost to increase the load on newly-forked zygote processes."
am: 8175f0955a

Change-Id: I6f61c45f690647c860e0ceb140857e53bc253f00
2016-12-16 22:35:08 +00:00
Adrian Roos
31b96311bf Merge "Assist app is not launched when long-pressing on Home key" into nyc-mr2-dev 2016-12-16 22:32:34 +00:00
Junda Liu
565fcb4b95 Merge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev 2016-12-16 22:24:19 +00:00
Treehugger Robot
d995c94426 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."
2016-12-16 22:20:25 +00:00
Torne (Richard Coles)
4e6876662d Merge "Add the webview zygote socket to the zygote whitelist." am: f8882ae834 am: bc801c663e
am: e19d6d414d

Change-Id: I3e8867f2ce74d03a304201b68f06bfd70853c2fa
2016-12-16 21:52:40 +00:00
Torne (Richard Coles)
e19d6d414d Merge "Add the webview zygote socket to the zygote whitelist." am: f8882ae834
am: bc801c663e

Change-Id: If1edf0bf30e8359912235c788a49131b528efb30
2016-12-16 21:45:40 +00:00
Torne (Richard Coles)
bc801c663e Merge "Add the webview zygote socket to the zygote whitelist."
am: f8882ae834

Change-Id: I02d08d8f91567b8bd6709137f98f87550c13f145
2016-12-16 21:38:17 +00:00
Treehugger Robot
f8882ae834 Merge "Add the webview zygote socket to the zygote whitelist." 2016-12-16 21:25:35 +00:00
Todd Kjos
bac0d87926 Merge changes I627e47c6,Ic85892b4 into nyc-mr1-dev-plus-aosp
am: 85a19e86d0

Change-Id: I240a2ae5d97e275d3660a7a2d5e9f2e5e222e813
2016-12-16 21:14:16 +00:00
Todd Kjos
aaa695809a Revert "Add boost to increase the load on newly-forked zygote processes."
am: 80fb0b0a44

Change-Id: Iaec14c37eb4bdf685d47ff28d7caa652bb1057dc
2016-12-16 21:14:13 +00:00