OSDN Git Service
Jerry Zhang [Tue, 17 Jul 2018 22:09:35 +0000 (15:09 -0700)]
Merge "UsbDescriptor: Add finite timeout to control transfer" am:
20dca26f41 am:
4bff76be80
am:
db3a291e9d
Change-Id: Ibf2bc0673e156919baf77c0db2033aa521b08052
Jerry Zhang [Tue, 17 Jul 2018 22:00:31 +0000 (15:00 -0700)]
Merge "UsbDescriptor: Add finite timeout to control transfer" am:
20dca26f41
am:
4bff76be80
Change-Id: Ie89d8a02c4e92e4d7d2372fad29abdba0c2fc568
Hongming Jin [Tue, 17 Jul 2018 21:33:20 +0000 (21:33 +0000)]
Merge "Revoke permissions defined in a to-be removed package."
TreeHugger Robot [Tue, 17 Jul 2018 21:11:35 +0000 (21:11 +0000)]
Merge "libmedia2_jni: use libbinder as shared library"
Jerry Zhang [Tue, 17 Jul 2018 20:59:15 +0000 (13:59 -0700)]
Merge "UsbDescriptor: Add finite timeout to control transfer"
am:
20dca26f41
Change-Id: I86a916694a497bedb7d2df8a64dd17e0e15ce332
Jeff Sharkey [Tue, 17 Jul 2018 20:01:51 +0000 (20:01 +0000)]
Merge "Handle new current.txt format."
Jeff Sharkey [Tue, 17 Jul 2018 19:29:40 +0000 (13:29 -0600)]
Handle new current.txt format.
We're starting to see "@interface" show up, so handle them like any
other interface. We're also seeing more details argument lists
with names and annotations; ignore them for now, since all our
existing lint checks work on the "real" data type.
Verified that it handles new support library current.txt files
without causing any regressions against existing framework
current.txt files.
Test: manual inspection
Bug:
111555356
Change-Id: Id11c3561edd317e4ba1a9b43993fd96d8243e00d
Jerry Zhang [Tue, 17 Jul 2018 19:47:29 +0000 (19:47 +0000)]
Merge "UsbDescriptor: Add finite timeout to control transfer"
TreeHugger Robot [Tue, 17 Jul 2018 19:43:08 +0000 (19:43 +0000)]
Merge "BatteryStatsHistory needs to public for unit test to work."
Laura Davis [Tue, 17 Jul 2018 18:50:10 +0000 (11:50 -0700)]
Merge "Docs: Removed narrative content." into pi-dev am:
b4f7c414a6
am:
7f05ea78dd
Change-Id: Ibfff8f72707a41936a4259a90d20eda559b44b0d
Laura Davis [Tue, 17 Jul 2018 18:40:15 +0000 (11:40 -0700)]
Merge "Docs: Removed narrative content." into pi-dev
am:
b4f7c414a6
Change-Id: I9b482df22bcef0fd24f6e56e2a4718bef229f4ad
Hongming Jin [Tue, 19 Jun 2018 19:35:37 +0000 (12:35 -0700)]
Revoke permissions defined in a to-be removed package.
Bug:
67319274
Test: run cts-dev --module CtsPermissionTestCases --test android.permission.cts.RemovePermissionTest#permissionShouldBeRevokedIfRemoved
Change-Id: Id23535d6c4d2fcf5c86dc1338af13a561b32154c
John Reck [Tue, 17 Jul 2018 18:29:28 +0000 (11:29 -0700)]
[automerger skipped] Merge "Remove unneeded JNI method" am:
1febe4196e -s ours am:
8f66efbffe -s ours
am:
d9b9a52299 -s ours
Change-Id: Ic2e3ec3bf3ca60cc648196b30422494144972e8c
Laura Davis [Tue, 17 Jul 2018 18:23:09 +0000 (18:23 +0000)]
Merge "Docs: Removed narrative content." into pi-dev
Tyler Gunn [Tue, 17 Jul 2018 18:22:51 +0000 (18:22 +0000)]
Merge "Ensure Notification re-post with setOnlyAlertOnce(true) silences sound."
John Reck [Tue, 17 Jul 2018 18:20:25 +0000 (11:20 -0700)]
[automerger skipped] Merge "Remove unneeded JNI method" am:
1febe4196e -s ours
am:
8f66efbffe -s ours
Change-Id: I463ac35b909cbc3c5b6edeba2b370d4dc233f778
John Reck [Tue, 17 Jul 2018 18:12:31 +0000 (11:12 -0700)]
[automerger skipped] Merge "Remove unneeded JNI method"
am:
1febe4196e -s ours
Change-Id: I3a366342f1a94c34e0815e5941b7b13816a637c8
TreeHugger Robot [Tue, 17 Jul 2018 18:08:31 +0000 (18:08 +0000)]
Merge "DPM: Propagate StrongBox-related exception"
Hui Yu [Tue, 17 Jul 2018 00:03:48 +0000 (17:03 -0700)]
BatteryStatsHistory needs to public for unit test to work.
Otherwise BatteryStatsHistoryTest gets "Illegal class access" error.
Test: atest BatteryStatsHistoryTest.java
Change-Id: I6efc9df24e1fd15cc3cdc4611a65d3e41efa63da
Steven Moreland [Tue, 17 Jul 2018 17:11:34 +0000 (10:11 -0700)]
libmedia2_jni: use libbinder as shared library
In order to prevent prebuilts from freezing the libbinder
internal API (the wire protocol), it is being made a
shared-only library.
Bug:
111454508
Test: m only
Change-Id: If7f8bd931dae5310eda6c230f20179418c2efa43
Ruchi Kandoi [Tue, 17 Jul 2018 17:02:43 +0000 (10:02 -0700)]
Merge "Hide apks not needed for a specific sku" into pi-dev am:
776b4e2dfa
am:
dae7a5ddd1
Change-Id: I3100d4b3187d35fbfdd5edb4e730c1734b5b596c
Treehugger Robot [Tue, 17 Jul 2018 17:00:30 +0000 (17:00 +0000)]
Merge "Remove unneeded JNI method"
Android Build Merger (Role) [Tue, 17 Jul 2018 16:48:08 +0000 (16:48 +0000)]
Merge "Merge "Track OkHttp changes" am:
0083876870 am:
7e6a128ec7 am:
f6e34a96ed"
Neil Fuller [Tue, 17 Jul 2018 16:47:38 +0000 (09:47 -0700)]
Merge "Track OkHttp changes" am:
0083876870 am:
7e6a128ec7
am:
f6e34a96ed
Change-Id: Ia54aa0c10bc96bab0f7df1f93956c925f9bf5e17
John Reck [Tue, 17 Jul 2018 16:46:56 +0000 (16:46 +0000)]
Merge "Expose async & counter publicly"
Ruchi Kandoi [Tue, 17 Jul 2018 16:41:08 +0000 (09:41 -0700)]
Merge "Hide apks not needed for a specific sku" into pi-dev
am:
776b4e2dfa
Change-Id: I1219ddda2808492d84e182c4192e4caee27ba297
Neil Fuller [Tue, 17 Jul 2018 16:32:31 +0000 (09:32 -0700)]
Merge "Track OkHttp changes" am:
0083876870
am:
7e6a128ec7
Change-Id: I8f94f0fa4e29770ccff3531a71552db230cf6bac
TreeHugger Robot [Tue, 17 Jul 2018 16:26:23 +0000 (16:26 +0000)]
Merge "Hide apks not needed for a specific sku" into pi-dev
Neil Fuller [Tue, 17 Jul 2018 16:16:15 +0000 (09:16 -0700)]
Merge "Track OkHttp changes"
am:
0083876870
Change-Id: Id872a519323e5e3237fb708fa7d2d9eeae579650
Jeff Sharkey [Tue, 17 Jul 2018 16:12:14 +0000 (16:12 +0000)]
Merge changes from topic "downloadvuln"
* changes:
Execute "strict" queries with extra parentheses.
Add support for appending standalone phrases.
TreeHugger Robot [Tue, 17 Jul 2018 16:04:15 +0000 (16:04 +0000)]
Merge "Fix TextureView.getBitmap with scale layer transform"
John Reck [Mon, 16 Jul 2018 17:42:35 +0000 (10:42 -0700)]
Expose async & counter publicly
Also add some go-faster to the JNI
Before:
android.os.TracePerfTest:INSTRUMENTATION_STATUS: enabled_mean=13
INSTRUMENTATION_STATUS: enabled_median=13
INSTRUMENTATION_STATUS: enabled_min=13
INSTRUMENTATION_STATUS: enabled_standardDeviation=0
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: beginEndSection_mean=3849
INSTRUMENTATION_STATUS: beginEndSection_median=3850
INSTRUMENTATION_STATUS: beginEndSection_min=3829
INSTRUMENTATION_STATUS: beginEndSection_standardDeviation=14
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: counter_mean=1836
INSTRUMENTATION_STATUS: counter_median=1837
INSTRUMENTATION_STATUS: counter_min=1832
INSTRUMENTATION_STATUS: counter_standardDeviation=2
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: asyncBeginEnd_mean=4992
INSTRUMENTATION_STATUS: asyncBeginEnd_median=4988
INSTRUMENTATION_STATUS: asyncBeginEnd_min=4964
INSTRUMENTATION_STATUS: asyncBeginEnd_standardDeviation=21
INSTRUMENTATION_STATUS_CODE: -1
After:
android.os.TracePerfTest:INSTRUMENTATION_STATUS: enabled_mean=13
INSTRUMENTATION_STATUS: enabled_median=13
INSTRUMENTATION_STATUS: enabled_min=13
INSTRUMENTATION_STATUS: enabled_standardDeviation=0
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: beginEndSection_mean=2974
INSTRUMENTATION_STATUS: beginEndSection_median=2971
INSTRUMENTATION_STATUS: beginEndSection_min=2958
INSTRUMENTATION_STATUS: beginEndSection_standardDeviation=15
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: counter_mean=1737
INSTRUMENTATION_STATUS: counter_median=1739
INSTRUMENTATION_STATUS: counter_min=1732
INSTRUMENTATION_STATUS: counter_standardDeviation=3
INSTRUMENTATION_STATUS_CODE: -1
.INSTRUMENTATION_STATUS: asyncBeginEnd_mean=3677
INSTRUMENTATION_STATUS: asyncBeginEnd_median=3679
INSTRUMENTATION_STATUS: asyncBeginEnd_min=3663
INSTRUMENTATION_STATUS: asyncBeginEnd_standardDeviation=11
INSTRUMENTATION_STATUS_CODE: -1
Test: builds, benchmarks, verified tracing still works
Bug:
111503982
Change-Id: I71cb026d034bf9b9f97427d10d5ff9ce3d103561
Nandana Dutt [Tue, 17 Jul 2018 14:19:20 +0000 (14:19 +0000)]
Merge "Fix system server leaked fd dump"
Treehugger Robot [Tue, 17 Jul 2018 13:43:10 +0000 (13:43 +0000)]
Merge "Track OkHttp changes"
Stan Iliev [Thu, 12 Jul 2018 20:53:59 +0000 (16:53 -0400)]
Fix TextureView.getBitmap with scale layer transform
Fix TextureView.getBitmap to capture content only from the layer.
Bug:
111401911
Test: A new test TextureViewTest.testTransformScale is passing
Change-Id: I2b9cee17fc48de7b12ed03d5b4f173ce5445dbfe
Bernardo Rufino [Tue, 17 Jul 2018 12:46:20 +0000 (12:46 +0000)]
Merge "Increase PerformBackupTask unit coverage"
Martijn Coenen [Tue, 17 Jul 2018 12:20:30 +0000 (12:20 +0000)]
Merge changes I4e06b3f9,Iffcbbb82,If9dd6913
* changes:
Move proxy debug info dumping back to Java.
Dump top binder proxy interface names in dumpsys.
Make BinderProxy @hide public class.
Eran Messeri [Mon, 9 Jul 2018 16:58:26 +0000 (17:58 +0100)]
DPM: Propagate StrongBox-related exception
When the caller attempts to generate a key via DevicePolicyManager
(using DevicePolicyManager.generateKeyPair), and specifies that
StrongBox should be used, throw the right exception indicating
StrongBox unavailability - the same one that is thrown if the same
parameters were passed to the KeyStore's key generation method.
This is achieved by catching the StrongBoxUnavailableException in
KeyChain, returning an error code indicating this particular failure
to the DevicePolicyManagerService, which then propagates it by
throwing a service-specific exception with a value indicating
StrongBox unavailability.
The DevicePolicyManager then raises StrongBoxUnavailableException.
Prior to this change the exception propagated from KeyChain would be
a generic failure so the caller would simply get a null result.
Bug:
110882855
Bug:
111183576
Bug:
111322478
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement
Change-Id: I9abe3f449b48eb5a960fafbc15c59b9b4ce7a966
Bernardo Rufino [Thu, 28 Jun 2018 07:30:14 +0000 (08:30 +0100)]
Increase PerformBackupTask unit coverage
With KV Refactor in mind.
* Added tests around empty queue and single package backups.
* Refactored a bit some of the existing tests.
* Moved from mocking BMS to using a real instance and had to adjust a
few things for this.
Test: atest PerformBackupTaskTest
Change-Id: I0ee3be32c7cbac5ed2cdc2717408749907c15ade
David Brazdil [Tue, 17 Jul 2018 11:03:07 +0000 (04:03 -0700)]
Merge changes If285d71a,Iffe5be7c am:
f37950d8c3 am:
c9b5e65747
am:
3efb177ca6
Change-Id: If7f397e4be6ace357f7a563b4546a9a7694fce65
David Brazdil [Tue, 17 Jul 2018 10:56:43 +0000 (03:56 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API" am:
ed1f171cb9 -s ours am:
dd540c644f -s ours
am:
548c2c0710 -s ours
Change-Id: I2c4c0a33dfd3eb8551f623fad24a078f51759710
TreeHugger Robot [Tue, 17 Jul 2018 10:53:58 +0000 (10:53 +0000)]
Merge "Remove unused line in PrecomputedText"
David Brazdil [Tue, 17 Jul 2018 10:53:35 +0000 (03:53 -0700)]
Merge changes If285d71a,Iffe5be7c am:
f37950d8c3
am:
c9b5e65747
Change-Id: I047358920ecc478de076c32384390ba856bd8c99
David Brazdil [Tue, 17 Jul 2018 10:48:42 +0000 (03:48 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API" am:
ed1f171cb9 -s ours
am:
dd540c644f -s ours
Change-Id: Ie2115a3f82b78a632dec2c85527755bcb667253a
Nandana Dutt [Thu, 12 Jul 2018 16:02:57 +0000 (17:02 +0100)]
Fix system server leaked fd dump
'lsof' was execed to dump the open file descriptors, but it does
not have the same permissions as system_server, presumably due to
SELinux restrcitions.
Now we get a list of open file descriptors from /proc/<pid>/fd and
resolve them via readlink, all inside system_server.
Test: Manually tested on a device and compared with the output of adb
lsof.
Change-Id: I4db8369a3a2bb0009c776277a8a6f92f72857ef8
David Brazdil [Tue, 17 Jul 2018 10:43:13 +0000 (03:43 -0700)]
Merge changes If285d71a,Iffe5be7c
am:
f37950d8c3
Change-Id: I667c07fa75e0cc5badad3f297fc14316a2acfc42
David Brazdil [Tue, 17 Jul 2018 10:37:16 +0000 (03:37 -0700)]
[automerger skipped] [DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
am:
ed1f171cb9 -s ours
Change-Id: Ied01c65b3352129d1ced3e41d2ce281077c52d37
Neil Fuller [Tue, 10 Jul 2018 20:13:34 +0000 (21:13 +0100)]
Track OkHttp changes
As part of creating a full facade over OkHttp code there
are some changes to OkHttp-related classes that must be tracked.
See the related external/okhttp commit for details.
Some non-functional lint / WS changes have been made as part of this
change.
Test: Ran CtsLibcoreOkHttpTestCases entirely
Test: Ran CtsLibcoreTestCases entirely
Test: run cts-dev -m CtsNetTestCases -t android.net.http.cts.HttpResponseCacheTest
Bug:
111055375
Change-Id: I0b0ec21fa376ea33e2fa5486e203e92d3c3337cf
Martijn Coenen [Fri, 6 Jul 2018 10:04:48 +0000 (12:04 +0200)]
Move proxy debug info dumping back to Java.
This had to be called from native because serialization
was done from native, but now that serialization is in Java
we can move this back to a more logical place.
Also, this allows us to dump the per-UID proxy counts in
this situation again.
Bug:
109888955
Test: sailfish builds, proxy debug info shown on hitting limits
Change-Id: I4e06b3f93e30ed1c7868ec9e018709a7e796e441
Martijn Coenen [Fri, 6 Jul 2018 09:26:26 +0000 (11:26 +0200)]
Dump top binder proxy interface names in dumpsys.
To facilitate real-time debugging.
Bug:
109888955
Test: builds, adb shell dumpsys activity binder-proxies shows output
Change-Id: Iffcbbb824f4050b6fb8f556c8b4d09115e53da18
David Brazdil [Tue, 17 Jul 2018 08:24:36 +0000 (08:24 +0000)]
Merge changes If285d71a,Iffe5be7c
* changes:
Revert^2: Build dark greylist from public + light grey API
[DO NOT MERGE] Revert "Build dark greylist from public + light grey API"
Martijn Coenen [Mon, 9 Jul 2018 18:22:10 +0000 (20:22 +0200)]
Make BinderProxy @hide public class.
To make some future refactoring easier.
Added some JavaDoc (mostly links to android.os.IBinder)
to make checkstyle happy.
Test: builds
Change-Id: If9dd6913868a34ea1e3d14fee1860a4ff368e06b
Mark Chien [Tue, 17 Jul 2018 07:30:29 +0000 (00:30 -0700)]
Merge "Remove SimChangeListener from Tethering" am:
6e35b2c596 am:
fbab182f44
am:
cd70c87c65
Change-Id: I57f979caab4aaf4e9f6481b27995a49e44ba31d9
Mark Chien [Tue, 17 Jul 2018 07:21:09 +0000 (00:21 -0700)]
Merge "Remove SimChangeListener from Tethering" am:
6e35b2c596
am:
fbab182f44
Change-Id: I7c386065179e8eae8dff0cfbf5227eb259dbb9b9
Mark Chien [Tue, 17 Jul 2018 07:10:56 +0000 (00:10 -0700)]
Merge "Remove SimChangeListener from Tethering"
am:
6e35b2c596
Change-Id: Ie85375b760684bfeb2af0231dbe81592866a4e48
Mark Chien [Tue, 17 Jul 2018 05:49:09 +0000 (05:49 +0000)]
Merge "Remove SimChangeListener from Tethering"
TreeHugger Robot [Tue, 17 Jul 2018 05:46:21 +0000 (05:46 +0000)]
Merge "Make stop complete notification call in to ActivityManager blocking."
TreeHugger Robot [Tue, 17 Jul 2018 03:03:03 +0000 (03:03 +0000)]
Merge "Remove menu container's focus to avoid feedback background"
TreeHugger Robot [Tue, 17 Jul 2018 02:45:52 +0000 (02:45 +0000)]
Merge "Log Wtf when UsageStats missing over a day of events"
TreeHugger Robot [Tue, 17 Jul 2018 02:20:55 +0000 (02:20 +0000)]
Merge "Release wakelock in LocationManagerService if client thread is dead"
Mathieu Chartier [Tue, 17 Jul 2018 01:37:24 +0000 (18:37 -0700)]
[automerger skipped] Merge "old paths contains all entries when updating" am:
600aeb124b -s ours am:
89e9a1ad43 -s ours
am:
e295a0e4e3 -s ours
Change-Id: If1377d662d0c668cef6269f464e496a9566b1c2c
TreeHugger Robot [Tue, 17 Jul 2018 01:33:19 +0000 (01:33 +0000)]
Merge "Menu ime button takes nav button width to show recents button for tablets"
Mathieu Chartier [Tue, 17 Jul 2018 01:28:55 +0000 (18:28 -0700)]
[automerger skipped] Merge "old paths contains all entries when updating" am:
600aeb124b -s ours
am:
89e9a1ad43 -s ours
Change-Id: Ie23f6aae28f3452623523855a030f6fb30a4b6fd
Mathieu Chartier [Tue, 17 Jul 2018 01:22:04 +0000 (18:22 -0700)]
[automerger skipped] Merge "old paths contains all entries when updating"
am:
600aeb124b -s ours
Change-Id: Ib77887238935225bda9457414b9ec5a41e6919d6
Seigo Nonaka [Tue, 17 Jul 2018 01:09:32 +0000 (18:09 -0700)]
Remove unused line in PrecomputedText
Bug: N/A
Test: N/A
Change-Id: I2456116657d8be893a8c477df14a5de490fbaa37
Matthew Ng [Thu, 28 Jun 2018 19:45:26 +0000 (12:45 -0700)]
Remove menu container's focus to avoid feedback background
Menu container contains no icons but holds a few buttons that may appear
later but using a mouse a square background will appear because it has
focus. Remove the focus to remove the feedback background ripple.
Test: use mouse and tap the area right of the home button
Change-Id: If4e57c1a27ca7fbe38712dc1ac6f9e5d2bb76c49
Fixes:
110042464
Yu-Han Yang [Wed, 11 Jul 2018 22:24:11 +0000 (15:24 -0700)]
Release wakelock in LocationManagerService if client thread is dead
- also put a timeout on the wakelock so that it won't be held forever.
Bug:
111321558
Fixes:
111321558
Test: Tested on device.
Change-Id: I36e90f73143ff12d8622dbbb3aad643b283d17ce
TreeHugger Robot [Tue, 17 Jul 2018 00:38:36 +0000 (00:38 +0000)]
Merge "Fix timestamp error in GaugeMetric"
Hall Liu [Tue, 17 Jul 2018 00:30:20 +0000 (17:30 -0700)]
[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""" am:
fce4acd679 -s ours am:
9818f2599f -s ours
am:
a4480d33e2 -s ours
Change-Id: I2470d095213d72e8a6c96c657778b8d9db66001d
Hall Liu [Tue, 17 Jul 2018 00:19:57 +0000 (17:19 -0700)]
[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc""" am:
fce4acd679 -s ours
am:
9818f2599f -s ours
Change-Id: I72fac0c55e0175256e35a9c12fea6d39c98bf468
Hall Liu [Tue, 17 Jul 2018 00:12:05 +0000 (17:12 -0700)]
[automerger skipped] Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc"""
am:
fce4acd679 -s ours
Change-Id: Id43c6c5c39767964e55b40d62785e3d14d4a4828
John Reck [Tue, 7 Nov 2017 00:02:49 +0000 (16:02 -0800)]
Remove unneeded JNI method
Test: ran PFD CTS tests
Change-Id: I9a40319595c757835f7e19a50dc0311077c9e627
Merged-In: I9a40319595c757835f7e19a50dc0311077c9e627
(cherry picked from commit
d7bd9190759e3a6658455ada987453928caec8a8)
Michael Wachenschwanz [Wed, 4 Jul 2018 02:25:32 +0000 (19:25 -0700)]
Log Wtf when UsageStats missing over a day of events
Bug:
110930764
Test: manual (hardcode future time in printLast24HrEvents)
Change-Id: Ia254f7512bfa549966dda3674140772504dbbffd
Jeff Sharkey [Mon, 16 Jul 2018 22:53:45 +0000 (16:53 -0600)]
Execute "strict" queries with extra parentheses.
SQLiteQueryBuilder has a setStrict() mode which can be used to
detect SQL attacks from untrusted sources, which it does by running
each query twice: once with an extra set of parentheses, and if that
succeeds, it runs the original query verbatim.
This sadly doesn't catch inputs of the type "1=1) OR (1=1", which
creates valid statements for both tests above, but the final executed
query ends up leaking data due to SQLite operator precedence.
Instead, we need to continue compiling both variants, but we need
to execute the query with the additional parentheses to ensure
data won't be leaked.
Test: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
Bug:
111085900
Change-Id: Ie85a95003ae134eef2fdfbf074c2f82d0a6a9f26
Mathieu Chartier [Mon, 16 Jul 2018 23:16:13 +0000 (23:16 +0000)]
Merge "old paths contains all entries when updating"
Laura Davis [Fri, 13 Jul 2018 22:12:35 +0000 (15:12 -0700)]
Docs: Removed narrative content.
Test: make ds-docs
Bug:
110268338
Change-Id: Ifaa4096d075500f1c7a53b1eec9e1944ed2ddda6
TreeHugger Robot [Mon, 16 Jul 2018 22:55:40 +0000 (22:55 +0000)]
Merge "Disable tests failing with ICU62"
Hall Liu [Mon, 16 Jul 2018 22:52:10 +0000 (22:52 +0000)]
Merge "Revert "Revert "Update SubscriptionInfo o use strings for mccmnc"""
Yao Chen [Mon, 16 Jul 2018 22:39:18 +0000 (15:39 -0700)]
Fix timestamp error in GaugeMetric
Bug:
111516208
Test: unit tests pass, manually tested too
Change-Id: Ia268d3a38c331daab0f96c33461bb7dc794ce610
Todd Kennedy [Mon, 16 Jul 2018 21:31:10 +0000 (14:31 -0700)]
Merge "Loosen resource file verification" into pi-dev am:
cf0b127110
am:
60413d0697
Change-Id: I95400ba3a885605bc52df10968ef2b4adf7f90a6
Robert Shih [Mon, 16 Jul 2018 21:20:21 +0000 (14:20 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev am:
e43837e258 am:
dccb62bcca am:
64cb4be887 am:
c450d1401e
am:
deb8dbad23
Change-Id: I15c3a600ff4e4802254bb41d4903eec10583febc
Todd Kennedy [Mon, 16 Jul 2018 21:15:09 +0000 (14:15 -0700)]
Merge "Loosen resource file verification" into pi-dev
am:
cf0b127110
Change-Id: I0b4012085579aa172a1a3f5a83325f0827523af5
Amith Yamasani [Mon, 16 Jul 2018 21:00:20 +0000 (14:00 -0700)]
Merge "Fix crash on calling getAppStandbyBucket()" into pi-dev am:
632c036d8c
am:
9d629c85fd
Change-Id: I9760ced42479a795c03ecefd24ed6b7597294421
Robert Shih [Mon, 16 Jul 2018 20:58:38 +0000 (13:58 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev am:
e43837e258 am:
dccb62bcca am:
64cb4be887
am:
c450d1401e
Change-Id: I7aba9ed971773ac2ea8cc7df5fe42ed9c022a5ab
Tyler Gunn [Tue, 3 Jul 2018 19:38:49 +0000 (12:38 -0700)]
Ensure Notification re-post with setOnlyAlertOnce(true) silences sound.
Where a notification channel has an associated looping sound, it should
be possible to re-post the notification with setOnlyAlertOnce(true) to
cause the notification channel's sound to silence.
When re-posting the notification, this CL fixes an issue where
NotificationManagerService wouldn't call clearSoundLocked to stop playing
the sound, resulting in the notification continuing to playing the sound
associated with the notification channel.
Test: Manual testing, updated unit test
Bug:
110348674
Change-Id: I3ec26f0804bcf59f7356a2329b73ba8ed8f7ea51
TreeHugger Robot [Mon, 16 Jul 2018 20:57:43 +0000 (20:57 +0000)]
Merge "Loosen resource file verification" into pi-dev
Jeff Sharkey [Mon, 16 Jul 2018 20:34:21 +0000 (14:34 -0600)]
Add support for appending standalone phrases.
When users are building queries, they often need to append several
standalone SQL clauses, and it's tedious to track their first clause
so they can manually append " AND " to each subsequent clause.
So add new appendWherePhrase() API which appends a standalone phrase
which is AND'ed together with any existing WHERE query.
Also fix bug in update() which would turn null values into the
string literal "null" instead of passing them through as SQL NULL.
Test: atest cts/tests/tests/database/src/android/database/sqlite/cts/SQLiteQueryBuilderTest.java
Bug:
111085900
Change-Id: Ia280dd864895654239503e080eaef925f5620d37
Todd Kennedy [Thu, 12 Jul 2018 20:15:54 +0000 (13:15 -0700)]
Loosen resource file verification
Bug:
77808145
Test: Tried to install corrupt APK prior to the change, install failed
Test: Tried to install corrupt APK after the change, install succeeded
Test: atest CtsAppSecurityHostTestCases:CorruptApkTests
Change-Id: I19a69e52a17c1080beaf2cc575c32f564b1033a3
Robert Shih [Mon, 16 Jul 2018 20:38:43 +0000 (13:38 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev am:
e43837e258 am:
dccb62bcca
am:
64cb4be887
Change-Id: Id7d4599c5d7d7c803e86afa88be582773c80741f
Amith Yamasani [Mon, 16 Jul 2018 20:38:23 +0000 (13:38 -0700)]
Merge "Fix crash on calling getAppStandbyBucket()" into pi-dev
am:
632c036d8c
Change-Id: I1f76c36d330c50b17fc6df35ffb014e3e97e3640
Felipe Leme [Mon, 16 Jul 2018 20:33:36 +0000 (13:33 -0700)]
Fixed test case.
Bug:
111346876
Test: m -j FrameworksServicesTests && \
adb install -r -t -g \
${OUT}/data/app/FrameworksServicesTests/FrameworksServicesTests.apk && \
adb shell am instrument -e class \
"com.android.server.locksettings.LockSettingsShellCommandTest" \
-w "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Change-Id: I8ad425cb9777934b14eaf3c738411beed0357c99
Seigo Nonaka [Mon, 16 Jul 2018 20:32:24 +0000 (13:32 -0700)]
Disable tests failing with ICU62
Bug:
111299224
Test: atest android.text.method.ForwardDeleteTest
Change-Id: Ic872c632a68a31c3fee2916d0ff4fce83b76eff6
Robert Shih [Mon, 16 Jul 2018 20:13:13 +0000 (13:13 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev am:
e43837e258
am:
dccb62bcca
Change-Id: I9e6762b25f001e31da7df0bb25984856989b9fd9
Christopher Morin [Mon, 16 Jul 2018 20:06:05 +0000 (20:06 +0000)]
Merge "Reland "OOM score management""
TreeHugger Robot [Mon, 16 Jul 2018 20:04:23 +0000 (20:04 +0000)]
Merge "Fix crash on calling getAppStandbyBucket()" into pi-dev
Robert Shih [Mon, 16 Jul 2018 19:51:28 +0000 (12:51 -0700)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev
am:
e43837e258
Change-Id: Ib0ef741f0188ff3e6edc52e20eae997e9dba56e4
Chong Zhang [Mon, 16 Jul 2018 19:33:46 +0000 (12:33 -0700)]
Merge "Fix broken javadoc link in MediaFormat" into pi-dev am:
15ae72085f
am:
741bcbee62
Change-Id: I87362a09b014b48ca1d8317d59bd355064cb463f
Chong Zhang [Mon, 16 Jul 2018 19:25:32 +0000 (12:25 -0700)]
Merge "Fix broken javadoc link in MediaFormat" into pi-dev
am:
15ae72085f
Change-Id: Id7af6bea28f60e93ce1a1cce94f053b9484ceb37
TreeHugger Robot [Mon, 16 Jul 2018 19:25:14 +0000 (19:25 +0000)]
Merge changes from topic "am-
9e4fa925-b00a-40e6-8fb0-
e5a4244e6284" into oc-dev
* changes:
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca am:
47c831e675 am:
d6143e9307
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca am:
47c831e675
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7 am:
1bce1217ca
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc am:
00b57fc9b7
[automerger] Fix TrackInfo parcel write am:
0d2dc943dc
Fix TrackInfo parcel write
Felipe Leme [Mon, 16 Jul 2018 19:23:02 +0000 (19:23 +0000)]
Merge "Implemented help for lock_settings Shell command."