Chris Craik
2369a6d753
Support shadows and reordering in ViewOverlay
...
am: 36d9a6dfba
2017-01-13 22:07:43 +00:00
Andrew Scull
8203155664
resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1
...
am: 3c9b36482f
2017-01-13 21:23:27 +00:00
Andrew Scull
3c9b36482f
resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969
...
am: 3aac3ebee1
2017-01-13 21:16:31 +00:00
Andrew Scull
3aac3ebee1
resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev
...
am: eb35ad9969
2017-01-13 17:17:49 +00:00
Andrew Scull
eb35ad9969
resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev
...
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
2017-01-13 15:28:36 +00:00
Andrew Scull
ad4aa1ce7d
resolve merge conflicts of e4cefbf4fc to nyc-dr1-dev
...
Change-Id: Ib536a33ba381c28397320edd516d52727e5bdacc
2017-01-13 13:16:09 +00:00
Chris Craik
36d9a6dfba
Support shadows and reordering in ViewOverlay
...
Bug: 32726440
Test: manual
Change-Id: Ic5d7efdee5a493b7768b9db8150f65f97b3f0a64
2017-01-12 19:17:19 -08:00
Philip P. Moltmann
331a4bb8d4
Do not write if apply() did not change the file.
...
am: 1f99f81bdc
2017-01-13 01:10:01 +00:00
Philip P. Moltmann
889a420a9e
Only persist last Shared Preferences state
...
am: d15c4f1da5
2017-01-13 01:09:03 +00:00
Philip P. Moltmann
1f99f81bdc
Do not write if apply() did not change the file.
...
Bug: 33385963
Test: SharedPreferences CTS tests
Change-Id: I39955f8fbcdaa54faa539a3c503e12cb00808136
2017-01-12 16:43:30 -08:00
Philip P. Moltmann
d15c4f1da5
Only persist last Shared Preferences state
...
If multiple async shared preferences writes are queued, all but the
last one can be ignored as they will be overwritten by the last one
anyway.
For commit() we need to make sure that we have at least persisted the
state of the commit.
Generation counts are 64 bit, hence they never overflow.
Test: Produced a lot of SharedPreferences.Editor.apply and did not see
excessive writes anymore, ran SharedPreferences CTS tests
Bug: 33385963
Change-Id: I3968ed4b71befee6eeb90bea1666a0bb646544f6
(cherry picked from commit 31d6889f4c
2017-01-12 16:42:59 -08:00
Andrew Scull
e4cefbf4fc
Don't save password metrics to disk.
...
On FBE devices, don't save the metrics to disk but compute them when the
password is first entered and only store them in RAM.
Merged-in: 5daf273b7e
2017-01-12 16:01:59 +00:00
Etan Cohen
3fc5b186fa
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13 am: 2a4e3bef2c
...
am: b32dfa4ef5
2017-01-11 23:22:51 +00:00
Etan Cohen
b32dfa4ef5
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" am: dfe8f5dc13
...
am: 2a4e3bef2c
2017-01-11 23:17:19 +00:00
Etan Cohen
2a4e3bef2c
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
...
am: dfe8f5dc13
2017-01-11 23:12:16 +00:00
Felipe Leme
c88368c270
Added BUGREPORT_OPTION_TELEPHONY.
...
am: a561b1f9c0
2017-01-11 23:09:01 +00:00
Etan Cohen
dfe8f5dc13
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
2017-01-11 22:59:25 +00:00
TreeHugger Robot
2729bb8517
Merge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev
2017-01-11 22:55:38 +00:00
Jeremy Joslin
ad9ff9c59a
Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 am: 425a0fdc95
...
am: ab9eb11e2f
2017-01-11 20:08:49 +00:00
Jeremy Joslin
ab9eb11e2f
Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3
...
am: 425a0fdc95
2017-01-11 19:59:27 +00:00
Jeremy Joslin
425a0fdc95
Merge "Move getActiveScorerPackage() to the score service."
...
am: b5488ec3b3
2017-01-11 19:52:37 +00:00
Treehugger Robot
b5488ec3b3
Merge "Move getActiveScorerPackage() to the score service."
2017-01-11 19:40:45 +00:00
Etan Cohen
6a4b323f08
[AWARE] Unhide Wi-Fi Aware API (baseline)
...
Baseline Wi-Fi Aware API providing discovery and connectivity (data-path).
Bug: 30983968
Test: unit tests + integration (sl4a) tests passing.
Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933
2017-01-11 11:13:26 -08:00
Mark Salyzyn
082a1721b5
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991 am: 6143cbf1e5
...
am: ef8ccc8510
2017-01-11 15:45:46 +00:00
Mark Salyzyn
ef8ccc8510
Merge "Replace cutils/log.h and log/logger.h with log/log.h" am: e7fcbcb991
...
am: 6143cbf1e5
2017-01-11 15:40:24 +00:00
Mark Salyzyn
6143cbf1e5
Merge "Replace cutils/log.h and log/logger.h with log/log.h"
...
am: e7fcbcb991
2017-01-11 15:35:19 +00:00
Mark Salyzyn
e7fcbcb991
Merge "Replace cutils/log.h and log/logger.h with log/log.h"
2017-01-11 15:24:11 +00:00
Neil Fuller
75f84f2261
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524 am: f4e236c794
...
am: 43d53395dc
2017-01-11 13:54:10 +00:00
Neil Fuller
43d53395dc
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket" am: 649a89e524
...
am: f4e236c794
2017-01-11 13:48:14 +00:00
Neil Fuller
f4e236c794
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
...
am: 649a89e524
2017-01-11 13:37:37 +00:00
Neil Fuller
649a89e524
Merge "Refactor RFCOMM / BluetoothSocket usage of LocalSocket"
2017-01-11 13:27:10 +00:00
Santos Cordon
f85ab8306f
Add Brightness setting for VR Mode.
...
am: d6a5660a2c
2017-01-11 03:12:05 +00:00
Santos Cordon
a00c235600
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev
2017-01-11 03:02:55 +00:00
Andreas Gampe
3b51506c5c
Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5 am: 140b9b65a1
...
am: e4cff36099
2017-01-11 03:01:40 +00:00
Andreas Gampe
e4cff36099
Merge "Zygote: Add fdsToIgnore" am: 5b22a826d5
...
am: 140b9b65a1
2017-01-11 02:46:57 +00:00
Andreas Gampe
140b9b65a1
Merge "Zygote: Add fdsToIgnore"
...
am: 5b22a826d5
2017-01-11 02:33:05 +00:00
Treehugger Robot
5b22a826d5
Merge "Zygote: Add fdsToIgnore"
2017-01-11 02:20:37 +00:00
Jeremy Joslin
99ca0df8d4
Merge "Moved isCallerActiveScorer() to the score service." am: 663b444196 am: 5fbd2791ac
...
am: 11b1311e21
2017-01-11 01:50:13 +00:00
Jeremy Joslin
11b1311e21
Merge "Moved isCallerActiveScorer() to the score service." am: 663b444196
...
am: 5fbd2791ac
2017-01-11 01:45:43 +00:00
Jeremy Joslin
5fbd2791ac
Merge "Moved isCallerActiveScorer() to the score service."
...
am: 663b444196
2017-01-11 01:41:14 +00:00
Treehugger Robot
663b444196
Merge "Moved isCallerActiveScorer() to the score service."
2017-01-11 01:30:03 +00:00
Treehugger Robot
60d10ea0f4
Merge changes I559eb049,I52425b84
...
* changes:
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
DO NOT MERGE Logging improvements in CaptivePortalLoginActivity
2017-01-11 01:06:57 +00:00
Andreas Gampe
8dfa178efb
Zygote: Add fdsToIgnore
...
Add file descriptors that should be ignored in the file descriptor
table check.
Use this to ignore the pipe file descriptors when starting an app
with invoke-with (wrapper).
Bug: 32607405
Test: m
Test: Device boots
Test: Apps start
Test: adb root && adb shell setprop wrap.com.android.calculator2 logwrapper && adb shell am start -S -n com.android.calculator2/.Calculator
Change-Id: I4a30dfc9382d3172cc815bd41b17a123799354f6
2017-01-10 16:55:34 -08:00
Jeremy Joslin
d7670f6d7c
Move getActiveScorerPackage() to the score service.
...
Implemented getActiveScorerPackage() in the NetworkScoreService to
make it more efficient (no need to query PM).
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 33781558
Change-Id: Iee7610e4982b44aefa1ef8b6c208292b8f9adcf8
Merged-In: I2144351c2c09cad30f80399069364f3572e38445
2017-01-10 16:41:42 -08:00
Jeremy Joslin
9b442faa91
Moved isCallerActiveScorer() to the score service.
...
Implemented isCallerActiveScorer() in the NetworkScoreService to make
it more efficient (no need to query PM). Exposed the call as a new
internal API on NetworkScoreManager and deprecated the call on
NetworkScorerAppManager.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug: 33781558
Change-Id: I8ad232f8ef34b6e2f155ebb232e64300303300f0
Merged-In: I0e2142af95b068d322343f7c9362ac53d46b545e
2017-01-10 16:11:33 -08:00
Robert Sesek
15fe73846c
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist. am: 54e387ddbe am: 839a185b2e
...
am: df781cc514
2017-01-10 23:52:13 +00:00
Felipe Leme
a561b1f9c0
Added BUGREPORT_OPTION_TELEPHONY.
...
This option takes a lightweight version of bugreport that only includes a few,
urgent sections used to report telephony bugs.
BUG: 32589463
BUG: 26849505
Test: manual
Merged-In: I6f90c02779a1e8aead690428626e3b9f06aa04df
Change-Id: I6f90c02779a1e8aead690428626e3b9f06aa04df
2017-01-10 15:43:27 -08:00
Robert Sesek
df781cc514
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist. am: 54e387ddbe
...
am: 839a185b2e
2017-01-10 23:40:15 +00:00
Robert Sesek
839a185b2e
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.
...
am: 54e387ddbe
2017-01-10 22:33:00 +00:00
Treehugger Robot
98d86fe2b7
Merge changes Ia1f2535c,I9ca93f31,If5b53f6f,I119e0bfc
...
* changes:
Dynamically add the webview_zygote's preloaded APK to the zygote FD whitelist.
Split core/jni/fd_utils-inl.h into a .h/.cpp pair.
Zygote: Additional whitelisting for legacy devices.
Zygote: Additional whitelists for runtime overlay / other static resources.
2017-01-10 22:21:01 +00:00
