TreeHugger Robot
8dacd6195c
Merge changes I8569aa7c,I2ac4ee57
...
* changes:
Rename location access check flag.
Rename Permissions Hub property.
2019-01-31 00:57:53 +00:00
TreeHugger Robot
dcc1a9dd36
Merge "Add feature flag for mainline module."
2019-01-31 00:38:07 +00:00
Hyundo Moon
88dd29a6a3
Merge changes Ie30f0ca8,I59b4d4ce
...
* changes:
Move Media 1.0 files in mainline back to framework
Remove MediaSessionEngine.CallbackStub
2019-01-31 00:35:30 +00:00
Yiwen Chen
c948e0a4ef
Merge "Add ramping ringer vibration duration flag"
2019-01-31 00:32:03 +00:00
TreeHugger Robot
95120c1006
Merge "Avoid unnecessary system calls"
2019-01-31 00:25:39 +00:00
TreeHugger Robot
2bd06a3062
Merge "Add sample rate for app compaction metrics."
2019-01-31 00:17:00 +00:00
Jeff Sharkey
2fbc125658
Merge "Respond to API feedback for directory names."
2019-01-31 00:05:06 +00:00
TreeHugger Robot
65dc480a6b
Merge "MediaPlayer2: unhide prepare DRM error codes"
2019-01-30 23:58:28 +00:00
TreeHugger Robot
799be06f5b
Merge "iorap: Fix ro.iorapd.enable property naming"
2019-01-30 23:58:23 +00:00
Eric Laurent
c011202beb
Merge "AudioService: clear recording activities on audioserver crash"
2019-01-30 23:57:09 +00:00
TreeHugger Robot
7fa0e124fd
Merge "Added null check to get brightness config."
2019-01-30 23:53:47 +00:00
TreeHugger Robot
4d4f346866
Merge "Disable automatic switching to guest."
2019-01-30 23:50:45 +00:00
TreeHugger Robot
7d84a0bd97
Merge "MediaCodec: change exception type"
2019-01-30 23:49:46 +00:00
TreeHugger Robot
66ab61928d
Merge "Change Settings preference title text style"
2019-01-30 23:37:23 +00:00
TreeHugger Robot
e0e205bb76
Merge "Duplicate fs-verity struct and constants if no header"
2019-01-30 23:34:46 +00:00
Sudheer Shanka
25ce4f1fff
Merge "Fix NPE in StorageManagerService."
2019-01-30 23:33:58 +00:00
TreeHugger Robot
50e5ee9d58
Merge "Increase char limit for Typographic clock strings."
2019-01-30 23:30:27 +00:00
Matt Casey
f984e58cc8
Merge "Remove enumerated voice states."
2019-01-30 23:26:07 +00:00
TreeHugger Robot
71f12a3093
Merge "Allow cross user SessionCallback support"
2019-01-30 23:05:37 +00:00
Android Build Merger (Role)
3cdacf346d
Merge "[automerger skipped] Merge "Add SystemApi for captive portal metrics" am: 55849979a5 am: 56bed1321e am: df46cd451f -s ours am skip reason: change_id I4bccfbd87bae5b2d65e45c7a5918aa45ab5d76e8 with SHA1 d4a9de2055 is in history"
2019-01-30 22:57:54 +00:00
Remi NGUYEN VAN
0974ee9cdb
[automerger skipped] Merge "Add SystemApi for captive portal metrics" am: 55849979a5 am: 56bed1321e
...
am: df46cd451fd4a9de2055
2019-01-30 14:56:57 -08:00
TreeHugger Robot
970e89459e
Merge "media: Silence an analyzer complaint; clean up code"
2019-01-30 22:56:09 +00:00
Henry Fang
d3f4b874b1
Merge "Add public API to use new interfaces from cas@1.1"
2019-01-30 22:53:50 +00:00
Pavel Grafov
ed02ce4f19
Merge "Nuke old setAlwaysOnVpnPackageForUser method." am: 35a8f1a38a am: 79867a16fb
...
am: 6efd265881
2019-01-30 14:50:00 -08:00
Remi NGUYEN VAN
df46cd451f
Merge "Add SystemApi for captive portal metrics" am: 55849979a5
...
am: 56bed1321e
2019-01-30 14:42:34 -08:00
Pavel Grafov
6efd265881
Merge "Nuke old setAlwaysOnVpnPackageForUser method." am: 35a8f1a38a
...
am: 79867a16fb
2019-01-30 14:36:37 -08:00
Remi NGUYEN VAN
56bed1321e
Merge "Add SystemApi for captive portal metrics"
...
am: 55849979a5
2019-01-30 14:35:30 -08:00
Xiangyu/Malcolm Chen
ee269f6e93
Merge "Adding validate before switch feature."
2019-01-30 22:34:22 +00:00
Pavel Grafov
79867a16fb
Merge "Nuke old setAlwaysOnVpnPackageForUser method."
...
am: 35a8f1a38a
2019-01-30 14:27:01 -08:00
Ricky Wai
bcd4bddc22
Merge "Allow work profile DPC app to hide itself in primary profile"
2019-01-30 22:24:29 +00:00
Remi NGUYEN VAN
55849979a5
Merge "Add SystemApi for captive portal metrics"
2019-01-30 22:24:12 +00:00
Makoto Onuki
d8bb71e015
Avoid unnecessary system calls
...
Test: boot
Bug: N/A
Change-Id: I428d0518e78059192de84e4043faf7f991aa8fff
2019-01-30 14:23:14 -08:00
Philip P. Moltmann
4ef7a11a67
Merge "Pull all current role holders into statsd"
2019-01-30 22:20:24 +00:00
Nazanin Bakhshi
8c4aab5031
Merge "Add a method to determine if a reboot is required to alter the modem config"
2019-01-30 22:19:39 +00:00
Jeff Sharkey
c4597797d1
Respond to API feedback for directory names.
...
We have public APIs to set "primary" and "secondary" directory names
when contributing new media, but we don't have a way to read out that
information once an app targets Q. So define columns to provide API
symmetry.
Also, since these are called "primary" and "secondary", it's
confusing to have a "secondary bucket ID" defined, so rename that to
be a "group ID" instead.
Since this is a major schema change, recalculate all columns that
are derived from file paths.
Fix bugs where we tried dropping SQLite internals when wiping the
schema of a database, which would have always failed.
Bug: 115377970
Test: atest MediaProviderTests
Test: atest cts/tests/tests/media/src/android/media/cts/MediaScanner*
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: I7b7b7e03bfdae6f94a1d70ac1d9e80776a2171b8
2019-01-30 15:14:26 -07:00
TreeHugger Robot
52968e6a8d
Merge "Don't crash cleaning up not-yet-live state"
2019-01-30 22:12:54 +00:00
Treehugger Robot
35a8f1a38a
Merge "Nuke old setAlwaysOnVpnPackageForUser method."
2019-01-30 22:10:40 +00:00
TreeHugger Robot
028b73d3c0
Merge "Expose new color long Graphics APIs as public APIs."
2019-01-30 22:04:02 +00:00
Yifan Hong
b558661cf3
Merge "Use default argument for VintfObject::CheckCompatibility." am: 0296deccca am: 976ef7e600
...
am: c146979f50
2019-01-30 14:01:22 -08:00
Ben Murdoch
2384df757c
Add sample rate for app compaction metrics.
...
Introduce a parameter for simple sampling of app compaction
metrics as they go into statsd. Rate is confirgurable with
DeviceConfig.
Test: atest FrameworksServicesTests:AppCompactorTest
Bug: 123574961
Change-Id: Iebfd815dc4f7c6db7b849259d8b0b031e7de8621
2019-01-30 21:51:40 +00:00
Yifan Hong
c146979f50
Merge "Use default argument for VintfObject::CheckCompatibility." am: 0296deccca
...
am: 976ef7e600
2019-01-30 13:49:01 -08:00
Jack Yu
6aa87386c0
[automerger skipped] Merge "Added a broadcast intent for clients to listen for country changes" am: 090b59fa45 am: 16dd167de0
...
am: a6d8ebdfbe3d33698bf5
2019-01-30 13:42:38 -08:00
Dan Sandler
cf318694e4
Merge "Some of us are weird." am: 559d6018b6 am: 99c3f55c89
...
am: 9007b5e977
2019-01-30 13:34:35 -08:00
Jack Yu
a6d8ebdfbe
Merge "Added a broadcast intent for clients to listen for country changes" am: 090b59fa45
...
am: 16dd167de0
2019-01-30 13:33:32 -08:00
Yifan Hong
976ef7e600
Merge "Use default argument for VintfObject::CheckCompatibility."
...
am: 0296deccca
2019-01-30 13:30:50 -08:00
Julia Reynolds
2fdeefc352
Merge "Tests for matchesCallFilter"
2019-01-30 21:27:53 +00:00
Yiwen Chen
555b83df78
Add ramping ringer vibration duration flag
...
Bug: 120789399
Test: When finish the whole change, flash into a dev phone to test first.
Change-Id: I5ece793f1214e7b8a29f4c8d4abcc7fa6d7b511a
2019-01-30 21:27:41 +00:00
Dan Sandler
9007b5e977
Merge "Some of us are weird." am: 559d6018b6
...
am: 99c3f55c89
2019-01-30 13:24:06 -08:00
Robert Shih
b22db9be9a
Merge "MediaPlayer2: mark MediaPlayer-style DRM APIs TestApi"
2019-01-30 21:23:10 +00:00
TreeHugger Robot
46c388fdd3
Merge "Reconcile logging of blocking helper and manual notification management."
2019-01-30 21:23:02 +00:00
