OSDN Git Service
George Mount [Wed, 26 Feb 2014 16:37:03 +0000 (16:37 +0000)]
Revert "Change Activity Scene Transitions to be more automatic."
This reverts commit
f10587faadb9080a7bf9991cbe04bac5525da482.
Change-Id: I2785a3d2d6b667cad6d61dcbbc1c624161735fa4
Yohann Roussel [Wed, 26 Feb 2014 16:23:33 +0000 (16:23 +0000)]
Merge "Add support.multidex tests app for an update bug."
Yohann Roussel [Tue, 15 Oct 2013 08:10:47 +0000 (10:10 +0200)]
Add support.multidex tests app for an update bug.
The failing scenario is
- install v1
- run
- update to v2
- update to v3
- run
last run was failing with initial multidex library versions because
it's still running on v1 extracted secondary dex files.
Change-Id: Id9811371fc70b0a4e9b49de913ee38d18699b21d
Alan Viverette [Wed, 26 Feb 2014 03:04:35 +0000 (03:04 +0000)]
Merge "Constrain starting sub row to list bounds"
Christopher Tate [Wed, 26 Feb 2014 02:48:09 +0000 (02:48 +0000)]
Merge "Deal with apps known to LocalTransport backend but with no data"
Alan Viverette [Wed, 26 Feb 2014 02:45:03 +0000 (18:45 -0800)]
Constrain starting sub row to list bounds
BUG:
13077653
Change-Id: Id01da055e8502b1447519666eb439d8480437c6c
Christopher Tate [Wed, 26 Feb 2014 01:42:21 +0000 (17:42 -0800)]
Deal with apps known to LocalTransport backend but with no data
An app might have backed something up and later deleted it, in which
case it will have a directory in the LocalTransport bookkeeping but
with no actual dataset. Skip these packages at restore time, since
we know a priori that there will be nothing to do.
Change-Id: I85853097bc65ed60e5efd217ee6553b50459e445
Amith Yamasani [Wed, 26 Feb 2014 00:54:10 +0000 (16:54 -0800)]
Regen current.txt to fix incorrect id for requiredForProfile
Change-Id: I9b3cf326070bffd78e3e30519495b062c81b3d52
Deepanshu Gupta [Tue, 25 Feb 2014 23:55:58 +0000 (23:55 +0000)]
Merge "Add DatePickerDialog to layoutlib"
George Mount [Tue, 25 Feb 2014 23:47:56 +0000 (23:47 +0000)]
Merge "Change Activity Scene Transitions to be more automatic."
Jim Miller [Tue, 25 Feb 2014 23:39:40 +0000 (23:39 +0000)]
Merge "Disable simple keyguard when notifications enabled."
Jim Miller [Tue, 25 Feb 2014 23:36:13 +0000 (15:36 -0800)]
Disable simple keyguard when notifications enabled.
Enabling notifications on keyguard tripped keyguard into simple
mode which isn't ready for prime-time. Disabled with variable.
Fixes bug
13172958
Change-Id: Ia281b06d754cd62455010f9e31c0ee81e4937977
Deepanshu Gupta [Tue, 25 Feb 2014 23:27:29 +0000 (15:27 -0800)]
Add DatePickerDialog to layoutlib
Includes android.app.DatePickerDialog in the layoutlib.jar
Bug: http://b.android.com/28318
Change-Id: I583dde4a8b88204bf98bfca8d91470e1aa4719ce
ztenghui [Tue, 25 Feb 2014 23:20:06 +0000 (23:20 +0000)]
Merge "Use pre-computed index to draw the shadow."
ztenghui [Fri, 14 Feb 2014 21:13:41 +0000 (13:13 -0800)]
Use pre-computed index to draw the shadow.
Also draw the umbra part as triangle fans instead of zig zag fashion.
b/
12840179
Change-Id: Iaa5d15e77351acdd71f076bd8f9bb2d4d2b92faf
Dianne Hackborn [Tue, 25 Feb 2014 02:12:28 +0000 (18:12 -0800)]
More battery stats.
- Add events for sync.
- Add more descriptive tags for wake events.
- Fix battery reset.
- Fix tracking of wifi data.
Change-Id: Ic07f2a86a5ed33e7da57eb1108c31c777ecd801f
Craig Mautner [Tue, 25 Feb 2014 20:29:33 +0000 (20:29 +0000)]
am
97686e00: am
91df7766: am
42ec5035: Modify API to hide ActivityView.
* commit '
97686e00233f6475bd4a5a48bc718fcf88bbf688':
Modify API to hide ActivityView.
Craig Mautner [Tue, 25 Feb 2014 20:25:55 +0000 (20:25 +0000)]
am
91df7766: am
42ec5035: Modify API to hide ActivityView.
* commit '
91df776654e5cf66e5115e0c46ecdbe19a55a0bc':
Modify API to hide ActivityView.
Craig Mautner [Tue, 25 Feb 2014 20:22:28 +0000 (20:22 +0000)]
am
42ec5035: Modify API to hide ActivityView.
* commit '
42ec5035672fbfe701ddbf90dcc4390dab9188af':
Modify API to hide ActivityView.
Craig Mautner [Tue, 25 Feb 2014 20:17:15 +0000 (12:17 -0800)]
Modify API to hide ActivityView.
Fixes build too.
Change-Id: Ibd571cf36c89691a37c45db59c31237fee17adac
John Spurlock [Tue, 25 Feb 2014 19:57:33 +0000 (19:57 +0000)]
Merge "Tabs -> spaces in frameworks/base."
Martijn Coenen [Tue, 25 Feb 2014 19:37:17 +0000 (11:37 -0800)]
Fix NFC docs breakage.
Change-Id: I680dc7974316c77cb1835b5a81f30e6961ba3c49
George Mount [Thu, 6 Feb 2014 22:12:53 +0000 (14:12 -0800)]
Change Activity Scene Transitions to be more automatic.
Shared element transitions are enabled by default
when the Window has a TransitionManager.
Shared element location and size are captured and
transferred to the target Activity.
ActionBar is treated as a shared element.
Change-Id: I0f22ea4e5cbe80254e848444e3f235cb742684f4
Mike Lockwood [Tue, 25 Feb 2014 19:01:24 +0000 (19:01 +0000)]
Merge "Fix accessorychat test program"
Mike Lockwood [Wed, 29 Jan 2014 18:41:05 +0000 (10:41 -0800)]
Fix accessorychat test program
Change-Id: Ib51b880f64b13e860721d594c900b45d5725b718
Dan Sandler [Tue, 25 Feb 2014 18:59:30 +0000 (18:59 +0000)]
Merge "Fix boot crash on devices defaulting to landscape."
Craig Mautner [Tue, 25 Feb 2014 18:56:11 +0000 (18:56 +0000)]
am
c407ace3: am
d4c819c0: am
dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev
* commit '
c407ace3019c4e542654cf17fd04d9436d3f3436':
Clean up activities and displays when done
Craig Mautner [Tue, 25 Feb 2014 18:52:55 +0000 (18:52 +0000)]
am
d4c819c0: am
dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev
* commit '
d4c819c0029da8fb7248564aefde2146d5ecfc19':
Clean up activities and displays when done
Craig Mautner [Tue, 25 Feb 2014 18:49:37 +0000 (18:49 +0000)]
am
dd9ce628: Merge "Clean up activities and displays when done" into klp-modular-dev
* commit '
dd9ce6287eb9ccae8d527e6750c91b0bd47834fc':
Clean up activities and displays when done
Craig Mautner [Tue, 25 Feb 2014 18:46:01 +0000 (18:46 +0000)]
Merge "Clean up activities and displays when done" into klp-modular-dev
Martijn Coenen [Tue, 25 Feb 2014 18:43:37 +0000 (18:43 +0000)]
Merge "Add an API to manually invoke Android Beam."
Craig Mautner [Tue, 25 Feb 2014 01:54:35 +0000 (17:54 -0800)]
Clean up activities and displays when done
More maintenance fixes.
Fix bug
13157352.
Change-Id: Ic86d39a84452a1cf1dc1762cec517b419ad0a852
Robert Greenwalt [Tue, 25 Feb 2014 18:36:45 +0000 (18:36 +0000)]
am
8395aadb: (-s ours) am
860ac9e4: am
41c684a7: am
0d39ef72: am
cf73f46a: am
43ec3b93: am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
8395aadbd3b2a11fac664f44c590576141c78615':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:33:28 +0000 (18:33 +0000)]
am
860ac9e4: am
41c684a7: am
0d39ef72: am
cf73f46a: am
43ec3b93: am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
860ac9e45f496604757cb27f248def98878f82bb':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:29:25 +0000 (18:29 +0000)]
am
41c684a7: am
0d39ef72: am
cf73f46a: am
43ec3b93: am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
41c684a7b5602991cb1af63b2bcaa4e41812dfb9':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:25:11 +0000 (18:25 +0000)]
am
0d39ef72: am
cf73f46a: am
43ec3b93: am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
0d39ef72112972dfadd70ef14c733672e4a2d646':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:21:50 +0000 (18:21 +0000)]
am
cf73f46a: am
43ec3b93: am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
cf73f46a514f5c2b1a0de137ed203401417307b4':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:18:05 +0000 (18:18 +0000)]
am
43ec3b93: am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
43ec3b939b732ea2d3b26635c51a6c91f2692270':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:14:26 +0000 (18:14 +0000)]
am
1f9ebc5f: (-s ours) am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
1f9ebc5fa73e7d324429a697cd10abb3761b1ff0':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:12:35 +0000 (10:12 -0800)]
am
868d4c34: am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
868d4c341034de6e2ebb6c1a247488b00d17c78d':
DO NOT MERGE Sanitize WifiConfigs
Robert Greenwalt [Tue, 25 Feb 2014 18:09:13 +0000 (10:09 -0800)]
am
95023066: DO NOT MERGE Sanitize WifiConfigs
* commit '
950230663fb3a9af438ec2ee57605fc9e7a58428':
DO NOT MERGE Sanitize WifiConfigs
Hui Lu [Tue, 25 Feb 2014 18:03:07 +0000 (18:03 +0000)]
am
fcf7d3a6: am
eeb291b7: am
95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
* commit '
fcf7d3a64947a8a0f05ee9e0669abe4a0727f926':
Reconnect/teardown proxy network connectivity.
Hui Lu [Tue, 25 Feb 2014 18:00:05 +0000 (18:00 +0000)]
am
eeb291b7: am
95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
* commit '
eeb291b7f36d63c3db467cc7f4be61af09aa3171':
Reconnect/teardown proxy network connectivity.
Hui Lu [Tue, 25 Feb 2014 17:56:42 +0000 (17:56 +0000)]
am
95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
* commit '
95e3cba1f66af5594b5bdc210426ced44dd7b7ac':
Reconnect/teardown proxy network connectivity.
Hui Lu [Tue, 25 Feb 2014 17:53:41 +0000 (17:53 +0000)]
Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev
Baligh Uddin [Tue, 25 Feb 2014 17:16:07 +0000 (17:16 +0000)]
Merge "Import translations. DO NOT MERGE"
Dan Sandler [Tue, 25 Feb 2014 17:11:05 +0000 (12:11 -0500)]
Fix boot crash on devices defaulting to landscape.
This is probably not what keyguard_simple_host_view should
look like in landscape, but we need the resource.
Bug:
13185323
Change-Id: Ib044db1f86510128d27ecf45546398c7c1b81aa4
Baligh Uddin [Tue, 25 Feb 2014 17:04:43 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE"
John Spurlock [Tue, 25 Feb 2014 16:46:31 +0000 (16:46 +0000)]
Merge "Remove unused animations."
John Spurlock [Tue, 25 Feb 2014 16:08:35 +0000 (11:08 -0500)]
Remove unused animations.
Change-Id: I7c34732c6bc8263c42461325437c90a06214d04a
Mike Lockwood [Tue, 25 Feb 2014 15:54:25 +0000 (15:54 +0000)]
am
f2d07694: am
6eff9949: am
0fc59cd9: am
da2bbaf2: am
2c7b913e: am
5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '
f2d07694d05240b039bd02cf3982941c0435c33d':
UsbDeviceManager: Fix race condition entering USB accessory mode
Mike Lockwood [Tue, 25 Feb 2014 15:51:18 +0000 (15:51 +0000)]
am
6eff9949: am
0fc59cd9: am
da2bbaf2: am
2c7b913e: am
5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '
6eff99494dd7b274b3b9f89c64ece6cabaff5c8e':
UsbDeviceManager: Fix race condition entering USB accessory mode
Mike Lockwood [Tue, 25 Feb 2014 15:48:03 +0000 (15:48 +0000)]
am
0fc59cd9: am
da2bbaf2: am
2c7b913e: am
5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '
0fc59cd958b87d015deac63797fcbfbcec518389':
UsbDeviceManager: Fix race condition entering USB accessory mode
Mike Lockwood [Tue, 25 Feb 2014 15:44:24 +0000 (15:44 +0000)]
am
da2bbaf2: am
2c7b913e: am
5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '
da2bbaf219117f7507c5c0015c41347a9cc27507':
UsbDeviceManager: Fix race condition entering USB accessory mode
Mike Lockwood [Tue, 25 Feb 2014 15:41:11 +0000 (15:41 +0000)]
am
2c7b913e: am
5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '
2c7b913e367670dde337893efd59029c054019fc':
UsbDeviceManager: Fix race condition entering USB accessory mode
Mike Lockwood [Tue, 25 Feb 2014 15:38:25 +0000 (15:38 +0000)]
am
5daec5b5: Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
* commit '
5daec5b58a89779b0f8775f52859bae0bda17b23':
UsbDeviceManager: Fix race condition entering USB accessory mode
Mike Lockwood [Tue, 25 Feb 2014 15:35:33 +0000 (15:35 +0000)]
Merge "UsbDeviceManager: Fix race condition entering USB accessory mode" into klp-dev
John Spurlock [Tue, 25 Feb 2014 14:40:05 +0000 (09:40 -0500)]
Tabs -> spaces in frameworks/base.
Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
Narayan Kamath [Tue, 25 Feb 2014 13:20:52 +0000 (13:20 +0000)]
am
cc99b18c: am
a6f70d8b: am
7fe5978b: am
2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"
* commit '
cc99b18ce30e6847bd9b29129755f63efd4f06fe':
Use reinterpret_cast when an integer is cast to a pointer
Narayan Kamath [Tue, 25 Feb 2014 13:20:47 +0000 (13:20 +0000)]
am
d8410d38: am
614b00de: am
a88abfb3: am
6ab07fac: Merge "Use long for pointers in opengl/EGL classes"
* commit '
d8410d38cf2eb133dab29aec722dce862584d115':
Use long for pointers in opengl/EGL classes
Narayan Kamath [Tue, 25 Feb 2014 13:17:39 +0000 (13:17 +0000)]
am
a6f70d8b: am
7fe5978b: am
2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"
* commit '
a6f70d8b2dc2a2d900dfaa4b3fcd0fbdffdcfb9e':
Use reinterpret_cast when an integer is cast to a pointer
Narayan Kamath [Tue, 25 Feb 2014 13:17:37 +0000 (13:17 +0000)]
am
614b00de: am
a88abfb3: am
6ab07fac: Merge "Use long for pointers in opengl/EGL classes"
* commit '
614b00de9cdd354a289d98173ba656e5260288e7':
Use long for pointers in opengl/EGL classes
Narayan Kamath [Tue, 25 Feb 2014 13:14:35 +0000 (13:14 +0000)]
am
7fe5978b: am
2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"
* commit '
7fe5978bf7c4b473d8f6db5a12cfdcd110511331':
Use reinterpret_cast when an integer is cast to a pointer
Narayan Kamath [Tue, 25 Feb 2014 13:14:30 +0000 (13:14 +0000)]
am
a88abfb3: am
6ab07fac: Merge "Use long for pointers in opengl/EGL classes"
* commit '
a88abfb3a5dccdad6210b294843fa2e21a27d378':
Use long for pointers in opengl/EGL classes
Narayan Kamath [Tue, 25 Feb 2014 13:11:43 +0000 (05:11 -0800)]
am
2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"
* commit '
2ba70fd49bfcbb516e75c198c106764609335feb':
Use reinterpret_cast when an integer is cast to a pointer
Narayan Kamath [Tue, 25 Feb 2014 13:11:40 +0000 (05:11 -0800)]
am
6ab07fac: Merge "Use long for pointers in opengl/EGL classes"
* commit '
6ab07fac49d6b618883a2ef4cea11f0959b3abe3':
Use long for pointers in opengl/EGL classes
Narayan Kamath [Tue, 25 Feb 2014 13:05:47 +0000 (13:05 +0000)]
Merge "Use reinterpret_cast when an integer is cast to a pointer"
Narayan Kamath [Tue, 25 Feb 2014 13:05:43 +0000 (13:05 +0000)]
Merge "Use long for pointers in opengl/EGL classes"
Kenny Guy [Tue, 25 Feb 2014 13:01:38 +0000 (13:01 +0000)]
Merge "Hide managed profiles from user switchers."
Derek Sollenberger [Tue, 25 Feb 2014 12:54:31 +0000 (12:54 +0000)]
Merge "Updates to the Skia API needed to merge the WebView m33 version of Skia."
Dan Sandler [Tue, 25 Feb 2014 12:34:12 +0000 (12:34 +0000)]
Merge "Default Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS=1."
Nicolas Prevot [Tue, 25 Feb 2014 10:35:25 +0000 (10:35 +0000)]
Merge "Adding the requiredForProfile flag."
Alan Viverette [Tue, 25 Feb 2014 02:49:01 +0000 (02:49 +0000)]
Merge "Force measurement in LinearLayout if any views are skipped"
Alan Viverette [Tue, 25 Feb 2014 02:21:09 +0000 (18:21 -0800)]
Force measurement in LinearLayout if any views are skipped
BUG:
12249256
Change-Id: I805cc70c4a2982befd9eb625be1378e6a2d9eba6
Dianne Hackborn [Tue, 25 Feb 2014 01:07:42 +0000 (01:07 +0000)]
Merge "Fix some issues with network usage in battery stats."
Dianne Hackborn [Tue, 25 Feb 2014 01:06:14 +0000 (17:06 -0800)]
Fix some issues with network usage in battery stats.
Change-Id: I8b354872511fcb55cecb2e09aada2eab41a1e202
Jeff Brown [Tue, 25 Feb 2014 00:40:54 +0000 (00:40 +0000)]
am
01d63a35: am
ae8106ef: am
2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev
* commit '
01d63a35245ad20cf5251b69777db5c81fc76a84':
Fix typo that causes dreaming on battery.
Jeff Brown [Tue, 25 Feb 2014 00:37:42 +0000 (00:37 +0000)]
am
ae8106ef: am
2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev
* commit '
ae8106ef9cdea9b6325afec197023d5b2d6214d0':
Fix typo that causes dreaming on battery.
Justin Koh [Tue, 25 Feb 2014 00:32:54 +0000 (00:32 +0000)]
am
ffbe7f83: (-s ours) am
22352885: am
bf3a45f3: Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev
* commit '
ffbe7f83ebc072d676e25c86d8ceb60205a9ec8a':
DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
Jeff Brown [Tue, 25 Feb 2014 00:32:37 +0000 (00:32 +0000)]
am
2326acb5: Merge "Fix typo that causes dreaming on battery." into klp-modular-dev
* commit '
2326acb591d889d9492219f5f8f79940fd66ba70':
Fix typo that causes dreaming on battery.
Justin Koh [Tue, 25 Feb 2014 00:29:56 +0000 (00:29 +0000)]
am
22352885: am
bf3a45f3: Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev
* commit '
2235288538d0c1758315bba961200d0e2254dedd':
DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
Jeff Brown [Tue, 25 Feb 2014 00:27:41 +0000 (00:27 +0000)]
Merge "Fix typo that causes dreaming on battery." into klp-modular-dev
Justin Koh [Tue, 25 Feb 2014 00:24:51 +0000 (00:24 +0000)]
am
bf3a45f3: Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev
* commit '
bf3a45f3adc435d7670ac5a92d2fb73b1e21f7aa':
DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
Justin Koh [Tue, 25 Feb 2014 00:20:45 +0000 (00:20 +0000)]
Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev
Jeff Brown [Tue, 25 Feb 2014 00:19:51 +0000 (16:19 -0800)]
Fix typo that causes dreaming on battery.
Bug:
13173012
Change-Id: I611970a5b4c4b0072ce52e3fc6a57dd3a0c075b3
Takahiro Aizawa [Wed, 11 Dec 2013 10:22:26 +0000 (19:22 +0900)]
DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
Interface of Surface class changed.
To reflect the change for EGL14, add producerControlledByApp flag.
Similar change can be seen in
0fa257fe53bf520bdde93996a1901ce6bc3e1788
This is a cherry-pick of https://android-review.googlesource.com/#/c/72973/ which is already in master, so do not merge.
Change-Id: Ic8911d3131e033747cfdabe59ac2fea1e90bb4a0
Robert Greenwalt [Fri, 7 Feb 2014 11:52:12 +0000 (03:52 -0800)]
DO NOT MERGE Sanitize WifiConfigs
Do this both on input from apps (giving error) and between wifi and
ConnectivityService (ignoring bad data). This means removing all
addresses beyond the first and all routes but the first default and
the implied direct-connect routes.
We do this because the user can't monitor the others (no UI), their
support wasn't intended, they allow redirection of all traffic
without user knowledge and they allow circumvention of legacy VPNs.
This should not move forward from JB as it breaks IPv6 and K has
a more resilient VPN.
Bug:
12663469
Change-Id: I0d92db7efc30a1bb3e5b8c6e5595bdb9793a16f2
Conflicts:
core/java/android/net/LinkProperties.java
services/java/com/android/server/WifiService.java
wifi/java/android/net/wifi/WifiStateMachine.java
Zhijun He [Mon, 24 Feb 2014 23:11:23 +0000 (15:11 -0800)]
Camera2: Correct some minor errors in awb region spec
Also correct some other typos.
Change-Id: Ib7ac65cd82d06a20aa47cce10a9976a3ac405142
Jeff Brown [Mon, 24 Feb 2014 22:25:19 +0000 (22:25 +0000)]
am
cd9cd758: am
c213b3a3: am
f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev
* commit '
cd9cd758d6dc884220f86ff10812c9e33a978de5':
Start the dream manager even if dreams are not supported.
John Spurlock [Mon, 24 Feb 2014 22:24:15 +0000 (22:24 +0000)]
Merge "Remove tabs from NotificationData."
Jeff Brown [Mon, 24 Feb 2014 22:21:50 +0000 (22:21 +0000)]
am
c213b3a3: am
f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev
* commit '
c213b3a34ccee7cfa72dab281cfa950e5f7df6fc':
Start the dream manager even if dreams are not supported.
Jeff Brown [Mon, 24 Feb 2014 22:18:32 +0000 (22:18 +0000)]
am
f7f80d7b: Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev
* commit '
f7f80d7b54b11d432bb6e72da526edf369128ea7':
Start the dream manager even if dreams are not supported.
Jeff Brown [Mon, 24 Feb 2014 22:15:59 +0000 (22:15 +0000)]
Merge "Start the dream manager even if dreams are not supported." into klp-modular-dev
Jeff Brown [Mon, 24 Feb 2014 21:57:53 +0000 (13:57 -0800)]
Start the dream manager even if dreams are not supported.
The dreams manager also manages dozing. It has a minimal footprint
so there is no real reason to disable the component (it just makes
debugging more difficult).
Improved the documentation of the config_dreamsSupported resource
to clarify exactly what it controls.
Bug:
12494706
Change-Id: I78244846f7c1ddfd11bc1605af59b0db91337971
John Spurlock [Mon, 24 Feb 2014 21:56:42 +0000 (16:56 -0500)]
Remove tabs from NotificationData.
Change-Id: I1993c48816ffc953045e3ef29a1063b89af4a546
Chris Craik [Mon, 24 Feb 2014 21:22:23 +0000 (21:22 +0000)]
Merge "Damage IsolatedZVolume when shadows change"
Chris Craik [Mon, 24 Feb 2014 20:54:34 +0000 (20:54 +0000)]
Merge "Modulate shadow alpha by caster alpha"
Derek Sollenberger [Fri, 17 Jan 2014 20:45:10 +0000 (15:45 -0500)]
Updates to the Skia API needed to merge the WebView m33 version of Skia.
This is a cherry-pick of 2 CLs:
21969a2b26945da3fd86aef7c93479e4fb359a65
c7a581cf7691db5c61e6694aa51daaa994004bd9
Change-Id: I6fd9366fbba0a336de1df794be9497983bfd13ae
John Reck [Mon, 24 Feb 2014 20:41:16 +0000 (20:41 +0000)]
Merge "Add back resize buffer"
Dianne Hackborn [Mon, 24 Feb 2014 20:33:42 +0000 (20:33 +0000)]
Merge "Improve how battery stats collects network stats."
OSDN Git Service
