OSDN Git Service
Charles He [Tue, 10 Oct 2017 19:45:12 +0000 (19:45 +0000)]
Merge "Add user restriction to suppress error dialogs."
TreeHugger Robot [Tue, 10 Oct 2017 19:37:59 +0000 (19:37 +0000)]
Merge "Disable autofill service when new service from Settings is invalid."
Brad Ebinger [Tue, 10 Oct 2017 19:09:28 +0000 (19:09 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI" am:
432c2b0fb9 am:
3b6df532f3 am:
8765abcc9e
am:
d0c9d44df9
Change-Id: I953f87ddf1b78d7da88d8516744abf6806572d59
Brad Ebinger [Tue, 10 Oct 2017 18:57:23 +0000 (18:57 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI" am:
432c2b0fb9 am:
3b6df532f3
am:
8765abcc9e
Change-Id: I25b39008317e333d422cd32a0c6348c010ca280f
Brad Ebinger [Tue, 10 Oct 2017 18:48:08 +0000 (18:48 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI" am:
432c2b0fb9
am:
3b6df532f3
Change-Id: I4d9031d32f59953d7b86cf361635c7d7f08fdf32
Michael Wright [Tue, 10 Oct 2017 18:41:28 +0000 (18:41 +0000)]
Merge "Ignore non-repeating vibrations in favor of repeating vibrations." into oc-mr1-dev am:
33238f213f
am:
9880b15175
Change-Id: I4876a17560bc082abfec5918005386777c7d04cb
Brad Ebinger [Tue, 10 Oct 2017 18:39:56 +0000 (18:39 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI"
am:
432c2b0fb9
Change-Id: I3332d44105c6ce4f8d4223caad66715c4c67d52f
Brad Ebinger [Tue, 10 Oct 2017 18:27:36 +0000 (18:27 +0000)]
Merge "Require DownloadRequest#Builder to have mandatory Source URI"
Andreas Gampe [Tue, 10 Oct 2017 18:18:17 +0000 (18:18 +0000)]
Merge "Parcel: Avoid NPE in finalization" am:
b085deece9 am:
cb34bdf55c am:
7934a7f828
am:
77de886b55
Change-Id: If5a797b8780765be8cc658d1e09bf4dea69dd923
Michael Wright [Tue, 10 Oct 2017 18:09:49 +0000 (18:09 +0000)]
Merge "Ignore non-repeating vibrations in favor of repeating vibrations." into oc-mr1-dev
am:
33238f213f
Change-Id: Ie20f60f76ddce6c634df005ecd4d7f7d9d0d9651
Andreas Gampe [Tue, 10 Oct 2017 18:01:22 +0000 (18:01 +0000)]
Merge "Parcel: Avoid NPE in finalization" am:
b085deece9 am:
cb34bdf55c
am:
7934a7f828
Change-Id: I5c2819892170855c4d009261785f9e8d26f9ad5e
Andreas Gampe [Tue, 10 Oct 2017 17:52:50 +0000 (17:52 +0000)]
Merge "Parcel: Avoid NPE in finalization" am:
b085deece9
am:
cb34bdf55c
Change-Id: Idd444cd9dfe78d4200f67a4fe6b3c4fb13767f29
Michael Wright [Tue, 10 Oct 2017 17:50:56 +0000 (17:50 +0000)]
Merge "Ignore non-repeating vibrations in favor of repeating vibrations." into oc-mr1-dev
TreeHugger Robot [Tue, 10 Oct 2017 17:49:18 +0000 (17:49 +0000)]
Merge "Move mPermissionTrees to permission settings"
Brad Ebinger [Tue, 10 Oct 2017 17:42:18 +0000 (17:42 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" into oc-mr1-dev am:
ad545464c2 -s ours
am:
7da56440e6 -s ours
Change-Id: Ie7830657ccfa9b1493bf2a4489004cbd96bca408
Andreas Gampe [Tue, 10 Oct 2017 17:35:55 +0000 (17:35 +0000)]
Merge "Parcel: Avoid NPE in finalization"
am:
b085deece9
Change-Id: I646baf55627a3874a10775846458af5f1dcd5d8c
Brad Ebinger [Tue, 10 Oct 2017 17:26:22 +0000 (17:26 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" into oc-mr1-dev
am:
ad545464c2 -s ours
Change-Id: I9285e05fb9278057240769648c3fa23c2b271ced
Andreas Gampe [Tue, 10 Oct 2017 17:21:17 +0000 (17:21 +0000)]
Merge "{Event,Security}Log: Unify code" am:
0c614c7018 am:
812b09d6bd am:
7f49276388
am:
e1c53e96da
Change-Id: I247b4a2159a03325ec9fe998f571d4fc71955da5
Treehugger Robot [Tue, 10 Oct 2017 17:20:56 +0000 (17:20 +0000)]
Merge "Parcel: Avoid NPE in finalization"
Brad Ebinger [Tue, 10 Oct 2017 17:14:35 +0000 (17:14 +0000)]
Merge "Fix NPE when removing PIN locked SIM during E911 call" into oc-mr1-dev
Andreas Gampe [Tue, 10 Oct 2017 17:10:24 +0000 (17:10 +0000)]
Merge "{Event,Security}Log: Unify code" am:
0c614c7018 am:
812b09d6bd
am:
7f49276388
Change-Id: I6947796df7a7673081d30a38f529be239b7defaf
Andreas Gampe [Tue, 10 Oct 2017 16:58:40 +0000 (16:58 +0000)]
Merge "{Event,Security}Log: Unify code" am:
0c614c7018
am:
812b09d6bd
Change-Id: I6ee5bbd2923ef7561739eb5cd14471ae87528a72
Andrew Solovay [Tue, 10 Oct 2017 16:51:15 +0000 (16:51 +0000)]
Merge "docs: Tiny usage fix ("e-mail" -> "email")" into oc-mr1-dev am:
c4a0b34248
am:
81643c09cc
Change-Id: Ib935716cec8ae54f83f6ad85604f97e9982cd14b
Andreas Gampe [Tue, 10 Oct 2017 16:50:37 +0000 (16:50 +0000)]
Merge "{Event,Security}Log: Unify code"
am:
0c614c7018
Change-Id: Id43119d11e27b0e0f6bf064e3aa76f8c990b64a4
Andrew Solovay [Tue, 10 Oct 2017 16:42:31 +0000 (16:42 +0000)]
Merge "docs: Tiny usage fix ("e-mail" -> "email")" into oc-mr1-dev
am:
c4a0b34248
Change-Id: I96c464236f694b194e9f5a6aba68b40ad840035d
Treehugger Robot [Tue, 10 Oct 2017 16:41:12 +0000 (16:41 +0000)]
Merge "{Event,Security}Log: Unify code"
Andrew Solovay [Tue, 10 Oct 2017 16:29:06 +0000 (16:29 +0000)]
Merge "docs: Tiny usage fix ("e-mail" -> "email")" into oc-mr1-dev
Fyodor Kupolov [Tue, 10 Oct 2017 16:21:04 +0000 (16:21 +0000)]
Merge "Crash if not all privileged permissions are whitelisted"
TreeHugger Robot [Tue, 10 Oct 2017 16:13:45 +0000 (16:13 +0000)]
Merge "switch to new API for compute image size"
Andreas Gampe [Tue, 10 Oct 2017 15:01:38 +0000 (08:01 -0700)]
Parcel: Avoid NPE in finalization
Check whether the guard is null to avoid:
Uncaught exception thrown by finalizer
java.lang.NullPointerException: Attempt to invoke virtual method 'void dalvik.system.CloseGuard.close()' on a null object reference
at android.os.ParcelFileDescriptor.closeWithStatus(ParcelFileDescriptor.java:740)
at android.os.ParcelFileDescriptor.finalize(ParcelFileDescriptor.java:990)
at java.lang.Daemons$FinalizerDaemon.doFinalize(Daemons.java:250)
at java.lang.Daemons$FinalizerDaemon.runInternal(Daemons.java:237)
at java.lang.Daemons$Daemon.run(Daemons.java:103)
at java.lang.Thread.run(Thread.java:764)
Follow-up to commit
da5a3e12f4f8f965c57d6f93c74190f43ea233f3.
Bug:
7426029
Bug:
10330121
Test: m
Change-Id: I903f1545ab784008727ff23bb95fe182bd95b62a
Hugo Benichi [Tue, 10 Oct 2017 14:42:24 +0000 (14:42 +0000)]
Merge "LinkProperties: fix some indentation issues" am:
a162726df7 am:
e3b6b636cf am:
a63788076a
am:
944e080c22
Change-Id: I0902027750cc797c950ed375832dcc379bbdb93b
Hugo Benichi [Tue, 10 Oct 2017 14:31:48 +0000 (14:31 +0000)]
Merge "LinkProperties: fix some indentation issues" am:
a162726df7 am:
e3b6b636cf
am:
a63788076a
Change-Id: Ife901fd1c9c30b3864ddce61326f2d5caacd0bae
Hugo Benichi [Tue, 10 Oct 2017 14:21:57 +0000 (14:21 +0000)]
Merge "LinkProperties: fix some indentation issues" am:
a162726df7
am:
e3b6b636cf
Change-Id: I8c639ddce8408d302f0aede2490d226ca9c4bd8c
Hugo Benichi [Tue, 10 Oct 2017 14:13:45 +0000 (14:13 +0000)]
Merge "LinkProperties: fix some indentation issues"
am:
a162726df7
Change-Id: If9bc7cf980aa14880dbf6cc43bc86cc269d306cb
Treehugger Robot [Tue, 10 Oct 2017 14:02:35 +0000 (14:02 +0000)]
Merge "LinkProperties: fix some indentation issues"
Hugo Benichi [Tue, 10 Oct 2017 07:29:06 +0000 (16:29 +0900)]
LinkProperties: fix some indentation issues
Test: no functional change
Change-Id: I469bba154feb382156e56043d83f066a5bd658aa
Jaewan Kim [Tue, 10 Oct 2017 06:01:04 +0000 (06:01 +0000)]
Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev am:
9bc71c4922
am:
3fabcdb45a
Change-Id: I84e5c9339250ed79e8cfdfefd9baddd2ceba3a78
Jaewan Kim [Tue, 10 Oct 2017 05:51:41 +0000 (05:51 +0000)]
Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev
am:
9bc71c4922
Change-Id: I3806838a0cd2e4ebe6bdf27fafcd22afe177bb22
TreeHugger Robot [Tue, 10 Oct 2017 05:44:55 +0000 (05:44 +0000)]
Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev
Andreas Gampe [Mon, 9 Oct 2017 23:21:11 +0000 (16:21 -0700)]
{Event,Security}Log: Unify code
Extract common code into eventlog_helper.
Bug:
67511924
Test: m
Test: Device boots
Test: cts-tradefed run commandAndExit cts -m CtsUtilTestCases -t android.util.cts.EventLogTest
Change-Id: Idafad832385f57c22f40dbb8570e95da6d44f08f
Andrew Solovay [Sat, 7 Oct 2017 02:02:28 +0000 (19:02 -0700)]
docs: Tiny usage fix ("e-mail" -> "email")
I needed to make an edit in this branch to verify part of our docs
process, so I found a Javadoc typo to fix. No code error, just took
out the hyphen in "e-mail" in a Javadoc comment.
Test: make ds-docs
Bug:
67515954
Change-Id: Icb9b2a9df0d7dfd697050735886adec80bc92ff8
Andrew Solovay [Tue, 10 Oct 2017 01:45:40 +0000 (01:45 +0000)]
Merge "docs: Adding API level 27 (Oreo MR1) to the docs build options" into oc-mr1-dev am:
64b23cca4d
am:
761427c75b
Change-Id: If69f27d2457e164461f4f1ef1b417f62d7ac71eb
Andrew Solovay [Tue, 10 Oct 2017 01:35:20 +0000 (01:35 +0000)]
Merge "docs: Adding API level 27 (Oreo MR1) to the docs build options" into oc-mr1-dev
am:
64b23cca4d
Change-Id: I4d71688ec991555d400e5ce86baad61270bba9b9
Andrew Solovay [Tue, 10 Oct 2017 01:19:14 +0000 (01:19 +0000)]
Merge "docs: Adding API level 27 (Oreo MR1) to the docs build options" into oc-mr1-dev
Felipe Leme [Tue, 10 Oct 2017 00:59:41 +0000 (17:59 -0700)]
Disable autofill service when new service from Settings is invalid.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.LoginActivityTest#testServiceIsDisabledWhenNewServiceInfoIsInvalid
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases -t android.autofillservice.cts.LoginActivityTest#testServiceIsDisabledWhenNewServiceNameIsInvalid
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Bug:
67496182
Change-Id: I2ee2b0ff125434feb18e539a07b64b83d390291f
TreeHugger Robot [Tue, 10 Oct 2017 01:17:34 +0000 (01:17 +0000)]
Merge "[Aware] Add support utility for PeerHandle to MAC translation"
TreeHugger Robot [Tue, 10 Oct 2017 01:15:49 +0000 (01:15 +0000)]
Merge "Matching interpolator for ripple"
Brad Ebinger [Mon, 9 Oct 2017 18:23:21 +0000 (11:23 -0700)]
Require DownloadRequest#Builder to have mandatory Source URI
This change modifies the API to require that the
DownloadRequest#Builder includes the Source URI as a mandatory,
non-null parameter.
Test: Manual, Telephony Test MBMS app
Change-Id: I7d44e977314a57fdf063aa233bfb978b48ebf1db
Andreas Gampe [Tue, 10 Oct 2017 00:01:25 +0000 (00:01 +0000)]
Merge "EventLog: Check for exception after add()" am:
c30a6ac2f1 am:
f8fa4b8352 am:
d145cab07b
am:
25c2a82bed
Change-Id: I12744607497e0e5c230994aad930413d1342f713
Chad Brubaker [Mon, 9 Oct 2017 23:46:43 +0000 (23:46 +0000)]
Merge "Expose RECORD_AUDIO to Instant Apps" into oc-mr1-dev am:
cffe04a719
am:
15e12ff1fa
Change-Id: Idd45c21186d1e005f6dcd50bfe3563403ee63c3a
Andreas Gampe [Mon, 9 Oct 2017 23:45:11 +0000 (23:45 +0000)]
Merge "EventLog: Check for exception after add()" am:
c30a6ac2f1 am:
f8fa4b8352
am:
d145cab07b
Change-Id: I5162438a7951512a179e15e7de4c20ec5aaecd97
Andreas Gampe [Mon, 9 Oct 2017 23:37:08 +0000 (23:37 +0000)]
Merge "EventLog: Check for exception after add()" am:
c30a6ac2f1
am:
f8fa4b8352
Change-Id: Ia9af9320a5b73f1062f7fa0f8cd829602bce4113
TreeHugger Robot [Mon, 9 Oct 2017 23:35:05 +0000 (23:35 +0000)]
Merge "Move summary_empty to settingslib"
Andreas Gampe [Mon, 9 Oct 2017 23:30:04 +0000 (23:30 +0000)]
Merge "EventLog: Check for exception after add()"
am:
c30a6ac2f1
Change-Id: I17768ab21d49afbc943702803293b8cd47804e5c
ztenghui [Mon, 9 Oct 2017 23:24:21 +0000 (16:24 -0700)]
Matching interpolator for ripple
Matching the interpolators to be declerate on both enter and exit.
According to the UX team feedback.
b/
63635160
Test: demo app, settings app and calculator app
Change-Id: I49b88ef73f0bd45cd2b2c26feb2443633f171575
Chad Brubaker [Mon, 9 Oct 2017 23:26:26 +0000 (23:26 +0000)]
Merge "Expose RECORD_AUDIO to Instant Apps" into oc-mr1-dev
am:
cffe04a719
Change-Id: I35ca80db5df3cce385020e3192f82f38d6c033d7
Andreas Gampe [Mon, 9 Oct 2017 23:23:21 +0000 (23:23 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog" am:
a98866a6b6 am:
a25528b085 am:
1802fc7882
am:
8597b21bb1
Change-Id: Ie13fff01d2305696e9e08f3529363206091d9b5a
Treehugger Robot [Mon, 9 Oct 2017 23:15:50 +0000 (23:15 +0000)]
Merge "EventLog: Check for exception after add()"
TreeHugger Robot [Mon, 9 Oct 2017 23:14:25 +0000 (23:14 +0000)]
Merge "Expose RECORD_AUDIO to Instant Apps" into oc-mr1-dev
Andreas Gampe [Mon, 9 Oct 2017 23:13:59 +0000 (23:13 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog" am:
a98866a6b6 am:
a25528b085
am:
1802fc7882
Change-Id: Ieaa64b9a5f92ccaed1ede82811ceab1f1224229c
TreeHugger Robot [Mon, 9 Oct 2017 23:05:02 +0000 (23:05 +0000)]
Merge "Convert libjnigraphics to Android.bp"
Andreas Gampe [Mon, 9 Oct 2017 22:58:57 +0000 (22:58 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog" am:
a98866a6b6
am:
a25528b085
Change-Id: Id6e6138b23c962bcd248e12de67e485782bb13aa
Makoto Onuki [Mon, 9 Oct 2017 22:50:14 +0000 (22:50 +0000)]
Don't take a lock on the UI thread. am:
d4b7862785
am:
15c84348b9
Change-Id: I0c6623d08b9eb069a2d20f6329068ae2fdf697cb
Andreas Gampe [Mon, 9 Oct 2017 22:49:04 +0000 (22:49 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog"
am:
a98866a6b6
Change-Id: I42aa318daa851c634531e9b0868437a16a59abdd
Brad Ebinger [Thu, 5 Oct 2017 18:39:06 +0000 (11:39 -0700)]
Fix NPE when removing PIN locked SIM during E911 call
There is the possibility of mCallback being null while
the Keyguard still has a PhoneStateListener registered
for onSimStateChanged callback. This can cause a NPE.
Bug:
66986066
Test: Manual, PIN/PUK locked SIM
Merged-In: Id8ca403a839cff994970c370973a91e8e5688722
Change-Id: I799c9521f787e800e259c3bdce9edee3f844f5f3
Treehugger Robot [Mon, 9 Oct 2017 22:18:25 +0000 (22:18 +0000)]
Merge "SecurityLog: Apply
7b25bb8 to SecurityLog"
Chenjie Yu [Mon, 9 Oct 2017 21:48:51 +0000 (21:48 +0000)]
Merge "refactor statspuller"
Makoto Onuki [Mon, 9 Oct 2017 21:28:23 +0000 (21:28 +0000)]
Don't take a lock on the UI thread.
am:
d4b7862785
Change-Id: Iae6c7832c7ac1c853b3e7aee19c23442e87cebfb
Fyodor Kupolov [Sat, 7 Oct 2017 00:02:21 +0000 (17:02 -0700)]
Crash if not all privileged permissions are whitelisted
Test: reboot device - no crashes
Test: Ran privapp_permissions.py for fugu/marlin/taimen
Bug:
64693550
Change-Id: I9522ccaa75858b9a3d153c95c529eff70cd13994
Andreas Gampe [Mon, 9 Oct 2017 15:25:36 +0000 (08:25 -0700)]
EventLog: Check for exception after add()
When reading events, calling Collection.add() may result in an
OutOfMemoryError or immutability error. Check for an exception
after the call in EventLog and SecurityLog.
Bug:
67511924
Test: m
Test: Device boots
Change-Id: If0fbf6b01051b5311eeb88d3f52470cd8b1eec59
Jeffrey Huang [Mon, 9 Oct 2017 21:10:02 +0000 (21:10 +0000)]
Merge changes from topics "RefactorDevControllers", "MoveDevOptionPrefCtrl"
* changes:
Use DeveloperOptionsPreferenceController
Move DevOptionsPrefController to SettingsLib
TreeHugger Robot [Mon, 9 Oct 2017 21:03:03 +0000 (21:03 +0000)]
Merge "Do not send SHUTDOWN broadcast to manifest receivers"
Ben Wagner [Mon, 9 Oct 2017 20:56:43 +0000 (20:56 +0000)]
Merge "Use own enum instead of SkTypeface::Style."
TreeHugger Robot [Mon, 9 Oct 2017 20:54:32 +0000 (20:54 +0000)]
Merge "Statsd Anomaly tracking for CountMetricProducer"
Colin Cross [Sun, 8 Oct 2017 01:38:31 +0000 (18:38 -0700)]
Convert libjnigraphics to Android.bp
See build/soong/README.md for more information.
Test: m -j
Change-Id: If302f63276fa815423f50df0f12c1700975dbc43
Fan Zhang [Mon, 9 Oct 2017 20:50:55 +0000 (13:50 -0700)]
Move summary_empty to settingslib
And use it as summary for SystemUI tuner activity.
Change-Id: I7a36c8aef9e43bff5a6c3a2329ee85478620c533
Fixes:
65612375
Test: rebuild
Siyamed Sinir [Mon, 9 Oct 2017 20:50:53 +0000 (20:50 +0000)]
Merge changes from topic "text_perf_sep_2017"
* changes:
Reduce Text layout performance test combinations
Performance test for text layout/draw
Makoto Onuki [Sat, 23 Sep 2017 00:22:50 +0000 (17:22 -0700)]
Don't take a lock on the UI thread.
Bug
66719356
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutHostTestCases
Change-Id: I1045eda4910e3c7d3172038a1efd31cdf9346729
TreeHugger Robot [Mon, 9 Oct 2017 20:37:29 +0000 (20:37 +0000)]
Merge changes from topic "wear_small_battery-master"
* changes:
Revert device idle timing changes for small battery devices.
Removing watch specific DeviceIdleController logic in favor of small battery device flag
Andreas Gampe [Mon, 9 Oct 2017 19:01:25 +0000 (12:01 -0700)]
SecurityLog: Apply
7b25bb8 to SecurityLog
Apply logging rewrites from commit
7b25bb8ec79e420e9655a00301cbca80a38cde2d
to SecurityLog.
Test: manual confirm event log messages from services continue
Bug:
31992412
Bug:
31456426
Change-Id: If482a89690fa9fd1da6b5e13398df4bab47ca200
Chenjie Yu [Thu, 5 Oct 2017 23:05:32 +0000 (16:05 -0700)]
refactor statspuller
Test: manual test on device
Change-Id: Ibdec6a821e47cd2b2e7435002219c0b2e3f4c5d2
TreeHugger Robot [Mon, 9 Oct 2017 19:28:16 +0000 (19:28 +0000)]
Merge "First version of SliceView (hidden for now)"
jeffreyhuang [Mon, 9 Oct 2017 17:24:09 +0000 (10:24 -0700)]
Use DeveloperOptionsPreferenceController
- Abstract controllers in settingsLib now use
DeveloperOptionsPreferenceController
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I6ff61b6e01c83beeca3f38a63f054570b2ff5a3b
TreeHugger Robot [Mon, 9 Oct 2017 18:26:40 +0000 (18:26 +0000)]
Merge "WifiScanner: cleanup unused commands"
Ben Wagner [Fri, 6 Oct 2017 21:36:23 +0000 (17:36 -0400)]
Use own enum instead of SkTypeface::Style.
The current use of SkTypeface::Style and the naming of
Typeface::fSkiaStyle are misleading. Neither is used to actually
interact with Skia (which no longer uses the type in its API). Instead,
this type and field are used to track the values which will be exposed
through the jni layer which match the Android SDK values for the
constants on the android.graphics.Typeface type.
This change allows Skia to hide and eventually remove SkTypeface::Style,
as this is the last known external user. Additionally this allows
Android an easier path when updating the Typeface API in the future.
Test: refactoring CL. Existing unit tests still pass.
Change-Id: Ic820105a5b0d98727586fdc4a9a1c45e8ad40ff3
Lucas Dupin [Mon, 9 Oct 2017 18:20:38 +0000 (18:20 +0000)]
Merge "Decreases likelihood of AoD flickering" into oc-mr1-dev am:
c856aa18e3
am:
bd8305f328
Change-Id: I8dc3e1eaaf3481cba4f67f117d553f254071cc1e
TreeHugger Robot [Mon, 9 Oct 2017 18:13:50 +0000 (18:13 +0000)]
Merge changes from topic "jr-blocker"
* changes:
Initial notification blocker
Provide more information to the noti asst
Lucas Dupin [Mon, 9 Oct 2017 18:11:40 +0000 (18:11 +0000)]
Merge "Decreases likelihood of AoD flickering" into oc-mr1-dev
am:
c856aa18e3
Change-Id: Ia9a137a7d7d4e0b170dabdae7aa5fd4253255a6e
TreeHugger Robot [Mon, 9 Oct 2017 18:01:54 +0000 (18:01 +0000)]
Merge "Decreases likelihood of AoD flickering" into oc-mr1-dev
Etan Cohen [Wed, 27 Sep 2017 20:57:02 +0000 (13:57 -0700)]
[Aware] Add support utility for PeerHandle to MAC translation
Add a support API to be used between system services only: added
in support of RTT service which is provided with a PeerHandle but
needs the corresponding MAC address.
Bug:
65015034
Test: unit tests on service, integration tests with RTT
Change-Id: I6848acda9bfef306b8feaae6987ff18f7bc2e6ec
Chad Brubaker [Mon, 9 Oct 2017 17:50:46 +0000 (10:50 -0700)]
Expose RECORD_AUDIO to Instant Apps
This runtime permission should have been exposed to Instant Apps but
incorrectly was not
Bug:
67578813
Test: cts-tradefed run cts -m CtsPermission2TestCases
Change-Id: Icad01cc8e99f52c6e638f54aaf78e9cc56475fc4
Chris Tate [Mon, 9 Oct 2017 17:30:37 +0000 (17:30 +0000)]
Merge "Backup OS service now processes unlock off the main thread"
TreeHugger Robot [Mon, 9 Oct 2017 17:09:10 +0000 (17:09 +0000)]
Merge "Add newly available version information to dumpsys"
jeffreyhuang [Fri, 6 Oct 2017 18:40:59 +0000 (11:40 -0700)]
Move DevOptionsPrefController to SettingsLib
- Create DeveloperOptionsPreferenceController in SettingsLib
Bug:
34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I5dc0c96f155def0772b2071dc3bc604fadfd4272
Rubin Xu [Mon, 9 Oct 2017 17:00:29 +0000 (17:00 +0000)]
Always synchronize the OEM unlock allowed bit to the FRP partition am:
2257fda563
am:
906026f14a
Change-Id: I82625f7b8ff7aeb8e5558b3f9e9e5f2ef675eb99
Fyodor Kupolov [Fri, 6 Oct 2017 23:28:49 +0000 (16:28 -0700)]
Do not send SHUTDOWN broadcast to manifest receivers
Test: adb shell svc power reboot
Test: SendShutdownBroadcast should take << 10 seconds (no timeout)
Bug:
66783517
Change-Id: I01d3dab6c24add323ee0ec990c3f7a7864ce4ad7
Rubin Xu [Mon, 9 Oct 2017 16:50:30 +0000 (16:50 +0000)]
Always synchronize the OEM unlock allowed bit to the FRP partition
am:
2257fda563
Change-Id: Iaa6299176ab871c41022c499f57e693ce3f36c96
Julia Reynolds [Wed, 4 Oct 2017 20:09:29 +0000 (16:09 -0400)]
Initial notification blocker
Does not currently track stats across reboots.
Test: make ExtServicesUnitTests &&
adb install -r $OUT/data/app/ExtServicesUnitTests/ExtServicesUnitTests.apk &&
adb shell am instrument -w android.ext.services.tests.unit/android.support.test.runner.AndroidJUnitRunner
Bug:
63095540
Change-Id: Ie3a299cdfb229dedf85a07de5cc19f7a8ea423e0
Julia Reynolds [Wed, 4 Oct 2017 20:04:56 +0000 (16:04 -0400)]
Provide more information to the noti asst
And pass user sentiment from the assistant to listeners.
Not all of the information the assistant might want is provided
by systemui yet, but the hooks to do so have been added in this CL.
Bug:
63095540
Test: runtest systemui-notification, cts
Change-Id: I8194c065b7895d6013a40320e76eb62caab1263f
Rubin Xu [Fri, 6 Oct 2017 11:07:32 +0000 (12:07 +0100)]
Always synchronize the OEM unlock allowed bit to the FRP partition
For devices using OEMLock HAL, OEM unlock allowed bit is maintained by the HAL.
However PersistentDataBlockService will only look at the OEM unlock allowed bit
on the pst partition to make sure FRP data is cleared on a unlockable device.
As a short term fix, make sure the OEM unlock allowed bit on both the HAL and pst
partition is always in sync.
Bug:
67043266
Test: On walleye/taimen, add an account, enable OEM unlock, factory reset
via fastboot, and observe FRP is not enforced.
Change-Id: Id4a0d81d7a424e17c2751e7e65582b51c14bd073