OSDN Git Service
Etan Cohen [Mon, 9 Oct 2017 17:27:44 +0000 (10:27 -0700)]
[PASSPOINT] Add metrics to determine deployment/avail of Passpoint
Add metrics which will help determine Passpoint availability in the
wild. The metrics measure the percentage of time a Passpoint network
is visible to user - by collecting historgrams of observations per
scan result.
Bug:
66951771
Test: unit test
Change-Id: I8c91f490a533f90a4f0630e1cb461e1d2643358b
TreeHugger Robot [Tue, 10 Oct 2017 22:51:47 +0000 (22:51 +0000)]
Merge "Add system property to allow testing OTA with the same build image"
TreeHugger Robot [Tue, 10 Oct 2017 22:50:00 +0000 (22:50 +0000)]
Merge "Remove nGetWidths and pass the jfloat[] as nComputeLineBreaks argument."
Hyunyoung Song [Tue, 10 Oct 2017 22:42:02 +0000 (22:42 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev am:
384689934d
am:
3702ce391d
Change-Id: I2ca8d4fb271245e3fc9b7f406456e3dc54dd96cd
Hyunyoung Song [Tue, 10 Oct 2017 22:30:23 +0000 (22:30 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev
am:
384689934d
Change-Id: Id4885fe270e24d54830d6858e37487de551a3f52
TreeHugger Robot [Tue, 10 Oct 2017 22:22:38 +0000 (22:22 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e" into oc-mr1-dev
Andreas Gampe [Tue, 10 Oct 2017 21:38:41 +0000 (21:38 +0000)]
Merge "LoggingPrintStream: Make visible for testing" am:
7d1789867b am:
dcb8cf8732 am:
0db4c361e3
am:
245ecc9a95
Change-Id: I933617b2bf177c82b69a4908ddeb65074186b52f
Andreas Gampe [Tue, 10 Oct 2017 21:29:12 +0000 (21:29 +0000)]
Merge "LoggingPrintStream: Make visible for testing" am:
7d1789867b am:
dcb8cf8732
am:
0db4c361e3
Change-Id: I10e61d65cd05c8d93d43a2fefee841023ec35889
Andreas Gampe [Tue, 10 Oct 2017 21:20:18 +0000 (21:20 +0000)]
Merge "LoggingPrintStream: Make visible for testing" am:
7d1789867b
am:
dcb8cf8732
Change-Id: I11119803f2176704e1f7ca8a36e7b62cf93f377b
Andreas Gampe [Tue, 10 Oct 2017 21:11:10 +0000 (21:11 +0000)]
Merge "LoggingPrintStream: Make visible for testing"
am:
7d1789867b
Change-Id: If6e464f6840b66deb6f6c61b0ca96d847444e910
TreeHugger Robot [Tue, 10 Oct 2017 21:04:30 +0000 (21:04 +0000)]
Merge changes from topic "StatusFragment"
* changes:
Update to Robolectric 3.4.2
Convert more of StatusFragment to PreferenceControllers
Treehugger Robot [Tue, 10 Oct 2017 20:57:55 +0000 (20:57 +0000)]
Merge "LoggingPrintStream: Make visible for testing"
TreeHugger Robot [Tue, 10 Oct 2017 20:53:04 +0000 (20:53 +0000)]
Merge "Skip brightness ramp if ColorFade is covering the screen content."
Jeffrey Huang [Tue, 10 Oct 2017 20:45:17 +0000 (20:45 +0000)]
Merge "Add more test to LogdSizePreferenceController"
Seigo Nonaka [Fri, 6 Oct 2017 18:41:00 +0000 (11:41 -0700)]
Remove nGetWidths and pass the jfloat[] as nComputeLineBreaks argument.
nGetWidths was always called just before nComputeLineBreaks. It would be
an improvement to pass the result array as the argument of
nComputeLineBreaks.
Bug:
65024629
Test: bit FrameworksCoreTests:android.text.StaticLayoutLineBreakingTest
Test: bit CtsTextTestCase:*
Test: Manually checked no regression in TextViewOnMeasurePerfTest
Test: Manually checked no regression in StaticLayoutPerfTest result
Change-Id: I566be66558a22b3a3ff79d502bebbbfec75dd065
TreeHugger Robot [Tue, 10 Oct 2017 20:18:44 +0000 (20:18 +0000)]
Merge "More complete implementation for condition and log matchers in statsd."
Charles He [Tue, 10 Oct 2017 19:45:12 +0000 (19:45 +0000)]
Merge "Add user restriction to suppress error dialogs."
Hyunyoung Song [Tue, 10 Oct 2017 17:35:59 +0000 (10:35 -0700)]
Wrap StackOverflowError in NotFoundException.
Bug:
67462465
Test: builds and tested using faulty apk with recursive drawable.
Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e
TreeHugger Robot [Tue, 10 Oct 2017 19:37:59 +0000 (19:37 +0000)]
Merge "Disable autofill service when new service from Settings is invalid."
Shubham Ajmera [Fri, 6 Oct 2017 21:07:37 +0000 (14:07 -0700)]
Add system property to allow testing OTA with the same build image
The property can be used to test post boot stage without needing
to change the build signature.
Test: make
Change-Id: Ic132da7fda346f0cced4fd9417a34f59501ae7ee
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
Tony Mantler [Tue, 10 Oct 2017 18:09:08 +0000 (11:09 -0700)]
Update to Robolectric 3.4.2
Bug: clean-up
Test: RunSettingsLibRoboTests
Change-Id: Id812a4d8aa6b1a4260d73087b742b043e79ab6a1
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
Yao Chen [Fri, 6 Oct 2017 23:01:10 +0000 (16:01 -0700)]
More complete implementation for condition and log matchers in statsd.
+ also synced proto from google3 to fix the LogEntryMatcher proto
+ MetricsManager represents StatsdConfig, it's responsible for initializing and managing all
LogEntryMatcher, Condition, and Metrics. Start review from here.
+ Added more complete StatsdConfig initialization, including building the map for:
LogEntryMatcher -> Metrics
LogEntryMatcher -> Condition
Condition -> Metrics.
All the maps use index(int). The extra amount of memory for storing mappings help us
quickly process log events.
The StatsdConfig initialization process detects malformed config
- Circle dependency
- Missing definition
etc.
And once we detect ANY error, statsd will reject the config. And the resources related to this
config will be released.
Test: Added unit tests
Change-Id: I2c4aefdbf3e2aa1701eacbb2fb5e653819ec1fbb
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 16:09:26 +0000 (09:09 -0700)]
LoggingPrintStream: Make visible for testing
The class must be public to avoid test issues. If the class is
package-private, the test would have to be in the boot class-
path:
Rejecting re-init on previously-failed class java.lang.Class<com.android.internal.os.LoggingPrintStreamTest$TestPrintStream>: java.lang.IllegalAccessError: Class com.android.internal.os.LoggingPrintStream extended by class com.android.internal.os.LoggingPrintStreamTest$TestPrintStream is inaccessible (declaration of 'com.android.internal.os.LoggingPrintStreamTest$TestPrintStream' appears in /data/app/com.android.frameworks.coretests-SD7GJmYE507ACoE9gu2mnw==/base.apk)
at java.lang.Object java.lang.reflect.Constructor.newInstance0(java.lang.Object[]) (Constructor.java:-2)
at java.lang.Object java.lang.reflect.Constructor.newInstance(java.lang.Object[]) (Constructor.java:334)
at junit.framework.Test junit.framework.TestSuite.createTest(java.lang.Class, java.lang.String) (TestSuite.java:61)
Test: m
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/LoggingPrintStreamTest.java
Change-Id: I26cead7954cf4309c8b3e16994c35a3f4a9eb798
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
jeffreyhuang [Mon, 9 Oct 2017 22:10:14 +0000 (15:10 -0700)]
Add more test to LogdSizePreferenceController
- Added additional tests
Bug:
34203528
Test: make RunSettingsLibRoboTests -j40
Change-Id: I92297a4cfd6175b9dd684a17b3060f89c2bedc31
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
Tony Mantler [Fri, 6 Oct 2017 17:24:49 +0000 (10:24 -0700)]
Convert more of StatusFragment to PreferenceControllers
Bug:
67410808
Test: RunSettingsLibRoboTests
Change-Id: I0184255878155124dc798137cfbf5aa1270e8ef6
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