358679 Commits

Author SHA1 Message Date
TreeHugger Robot
71a8fcfdc7 Merge "Revert "Fix MediaDrm security level APIs"" 2018-02-11 17:16:14 +00:00
Tobias Thierer
fda717d501 Revert "Fix MediaDrm security level APIs"
This reverts commit 778639efbe1db003487f788a4e7f513414bcfd7c.

Reason for revert: Build cop here. The CL topic that I'm reverting broke several builds: Drm.h's openSession(Vector<uint8_t> &sessionId) hides overloaded virtual function openSession(DrmPlugin::SecurityLevel securityLevel, ..) from IDrm.h.

https://android-build.googleplex.com/builds/submitted/4598692/full-eng/latest/view/logs/build_error.log

Change-Id: I86bb202125b17bdeea12c414f3eca2a9e016dac2
2018-02-11 15:02:09 +00:00
baisheng
f62d869ea5 Add dedicated signature permissions to platform manifest and shell manifest which could enable/disable BT and Wifi state on watch
Skip Bluetooth consent UI if running on shell, also fix a typo in log message.

Test: Manual test running `adb root; adb shell service call bluetooth_manager 6` and see if BT is on without consent UI.
Bug: 69872231
Change-Id: Ie513794a7fc13041259fd84734bfc651495ba5cf
2018-02-11 15:03:19 +08:00
TreeHugger Robot
049ecedd92 Merge "Update netpolicy,bstats tests to not assume DUT will be plugged-in." 2018-02-11 03:06:22 +00:00
Sudheer Shanka
eab672411e Update netpolicy,bstats tests to not assume DUT will be plugged-in.
Bug: 73037837
Test: atest com.android.server.net.ConnOnActivityStartTest
Test: atest com.android.internal.os.BstatsCpuTimesValidationTest
Change-Id: I0647b6746d7d2cc9e4d24dfb14321f3fa5ac7f1c
2018-02-10 16:31:34 -08:00
Evan Laird
06e9fd822b Move SignalDrawable to SettingsLib so every can enjoy it
Anyone with a dependecy on SettingsLib should be able to create and use
a platform SignalDrawable.

Test: runtest systemui; visual
Change-Id: I65caa2ac69cae52b6ad798937df3f3399ab406af
Fixes: 72511183
2018-02-10 09:36:55 -08:00
Tomasz Wasilczyk
e6a72cce0b Remove broadcastradio HAL 1.2 support from the framework.
Bug: 62945293
Test: it boots
Change-Id: I7f434ed7ef07d0cf9afa93c17e78f2bf80f43b36
2018-02-10 12:40:14 +00:00
Pavlin Radoslavov
606a384678 Merge "Use proper string formatting for the "Active device" string" am: 1b5703f9e9 am: 7cb1dbd38a
am: b59037596a

Change-Id: Ie29b906d4592b613dc91f3ad858e543ff8e5f7a2
2018-02-10 09:40:05 +00:00
Pavlin Radoslavov
b59037596a Merge "Use proper string formatting for the "Active device" string" am: 1b5703f9e9
am: 7cb1dbd38a

Change-Id: I7b9eee4064112569c2dead6bc10d232d2b4cc118
2018-02-10 09:27:54 +00:00
Pavlin Radoslavov
7cb1dbd38a Merge "Use proper string formatting for the "Active device" string"
am: 1b5703f9e9

Change-Id: I53fcb586273b02339e83f2514274e3be662b67ba
2018-02-10 09:16:20 +00:00
Chen Xu
e8b3a537d3 Merge "add a current table in CarrierIdProvider" 2018-02-10 05:46:49 +00:00
TreeHugger Robot
b8ce4e96d1 Merge "Register for fallback vibration's death" 2018-02-10 04:30:30 +00:00
TreeHugger Robot
d6d5e0cc77 Merge changes from topic "revert-assetmanager2-02-09-2018"
* changes:
  Revert "Replace AssetManager with AssetManager2 implementation"
  Revert "libandroidfw: Make sure to set the 'app as lib' flag"
  Revert "Make idiomatic use of ApkAssets and AssetManager"
  Revert "libandroidfw: Add ApplyStyle and SetConfiguration benchmark"
  Revert "libandroidfw: Improve performance of AssetManager2"
  Revert "AssetManager2: Allow out of order type/type spec"
  Revert "AssetManager2: Fix list function"
  Revert "AssetManager2: Fix issue with native cast"
2018-02-10 03:42:41 +00:00
TreeHugger Robot
8a1bacaf91 Merge "Benchmark: stats_write" 2018-02-10 03:33:20 +00:00
TreeHugger Robot
7841ff5e88 Merge "Fix MediaDrm security level APIs" 2018-02-10 03:28:03 +00:00
TreeHugger Robot
a6ed522528 Merge "AOD font sizes" 2018-02-10 02:45:25 +00:00
Ng Zhi An
bbefdec6a4 Log app start to statsd
Bug: 72713338
Test: manual, open app, logcat -b stats
Change-Id: Ic5dc74a637601df443de29eb6f13bd63dd03c6e7
2018-02-09 18:43:11 -08:00
TreeHugger Robot
ef8e8ef334 Merge "MediaPlayer2: hook up srcId." 2018-02-10 02:31:46 +00:00
Tyler Gunn
4a0dde1f1c Merge "Add InCallService docs to state prerequisites for be being a dialer app." am: 6a3031713c am: 07545d18a2
am: a5627cd0e2

Change-Id: I8b423fba0e10abffc757e8d5ad4feb3b01732e01
2018-02-10 02:26:52 +00:00
TreeHugger Robot
a27ae0fdd1 Merge "Add clear method to ProtoOutputStream so it is reusable by just rewinding its internal pointer." 2018-02-10 02:20:30 +00:00
Tyler Gunn
a5627cd0e2 Merge "Add InCallService docs to state prerequisites for be being a dialer app." am: 6a3031713c
am: 07545d18a2

Change-Id: I040613717aef7626dff3eafb2f49c943255d5795
2018-02-10 02:11:17 +00:00
nharold
29d6c4367c Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode" am: 43699e90f3 am: e736f83caf
am: 0f7857e587

Change-Id: Ib33ccecfe2fc600c05a208d24df10a474addb0e5
2018-02-10 02:11:15 +00:00
TreeHugger Robot
b37ef221b9 Merge "Remove unnecessary interactive check from alarm dumpsys" 2018-02-10 02:05:28 +00:00
Treehugger Robot
1b5703f9e9 Merge "Use proper string formatting for the "Active device" string" 2018-02-10 02:05:12 +00:00
TreeHugger Robot
b6ff8364c9 Merge "[3rd try] JobScheduler to use UID active state for job exemption" 2018-02-10 01:59:36 +00:00
nharold
0f7857e587 Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode" am: 43699e90f3
am: e736f83caf

Change-Id: If7330b4fdf5d2ccbddb590ab81a4b19c1f612b66
2018-02-10 01:57:50 +00:00
Tyler Gunn
07545d18a2 Merge "Add InCallService docs to state prerequisites for be being a dialer app."
am: 6a3031713c

Change-Id: I08fb54de452d6f334232d24caf8f89caba85c515
2018-02-10 01:52:07 +00:00
nharold
e736f83caf Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode"
am: 43699e90f3

Change-Id: I1f286f0215ce88f947775ded0ddfbc8e0cd7bc55
2018-02-10 01:46:00 +00:00
TreeHugger Robot
9f3bfa1cc2 Merge "Declare a WTF if setting an alarm fails" 2018-02-10 01:35:48 +00:00
Jeff Tinker
778639efbe Fix MediaDrm security level APIs
During development of the vendor/widevine HAL module, the newly added
MediaDrm.setSecurityLevel method was found to be difficult to
implement efficiently since the security level is needed at the time
a session is opened. This CL moves the security level parameter to
openSession to resolve this problem.

bug:72831697
bug:64001680

test: GTS media tests
Change-Id: I74b3d1013405805c18b9794bbf7c46348e0ccda9
2018-02-09 17:18:48 -08:00
Lucas Dupin
70c35b50b9 AOD font sizes
Rebalanced font size so keyguard message isn't bigger
than the clock.

Test: visual
Change-Id: I0d24c44616b2b1a0787fa9e55ccb439b30a152ac
2018-02-09 16:55:30 -08:00
TreeHugger Robot
116c14a248 Merge "MediaFrameworkTest: Configure video snapshot framerate" 2018-02-10 00:54:55 +00:00
TreeHugger Robot
bf3248fda9 Merge "Update internal ViewPager's SavedState to match Support Library version" 2018-02-10 00:49:02 +00:00
Tyler Gunn
0fc03bb297 Merge "Add Connection Event for supplementary service notifications." am: efccc1babe am: 4d2dae8f0c
am: cb64e33660

Change-Id: I782179c6a96d7a953c3201943726ae1e34735ca8
2018-02-10 00:25:05 +00:00
Makoto Onuki
0b05aa627f Remove unnecessary interactive check from alarm dumpsys
Test: boot && dumpsys alarm
Change-Id: I1fa564917cd7631090219f9df99286ccb83069ff
2018-02-09 16:14:26 -08:00
Tyler Gunn
cb64e33660 Merge "Add Connection Event for supplementary service notifications." am: efccc1babe
am: 4d2dae8f0c

Change-Id: Ide105970d9c91f2fa5e2ec14410da011918d92ec
2018-02-10 00:11:19 +00:00
David Chen
c189bdcb05 Small fix to anomaly tracker in statsd.
If the config specifies only one past bucket for anomaly detection,
statsd doesn't want to store any past buckets since only the current
bucket being tracked in the Metrics Producer is used for deciding
if we hit the anomaly.

Test: Checked that statsd_test passes.
Change-Id: I7ca65bf7d2dfcb2d5c7d5c90f63f4a1c70fbc792
2018-02-09 16:09:26 -08:00
TreeHugger Robot
c0927dd36d Merge "Send package to permission check" 2018-02-10 00:09:23 +00:00
TreeHugger Robot
1982a10913 Merge "Honor INSTANT_APPS_ENABLED only for web intents" 2018-02-10 00:07:44 +00:00
TreeHugger Robot
5a0dcdfec9 Merge "use writepixels on surface, the canvas version is deprecated" 2018-02-10 00:07:19 +00:00
Winson Chung
f8ed7695ad Merge "Fix issue with quick switch animation not running." 2018-02-10 00:00:49 +00:00
Tyler Gunn
6a3031713c Merge "Add InCallService docs to state prerequisites for be being a dialer app." 2018-02-10 00:00:04 +00:00
Tyler Gunn
4d2dae8f0c Merge "Add Connection Event for supplementary service notifications."
am: efccc1babe

Change-Id: Ia8f03045830032e42d2518e97fe74fd55734d524
2018-02-09 23:59:33 +00:00
Adam Stone
94395c994b Fix getMetrics to return all relevant metrics
This allows us to transfer a PersistableBundle containing the previously
unavailable metrics.

Bug: 64001676

Test: CTS test for metrics and GPlay test
Change-Id: Ia6a41225cb551e38233b67bb4161b294c40260f1
2018-02-09 23:58:04 +00:00
Makoto Onuki
e491821c5f [3rd try] JobScheduler to use UID active state for job exemption
JobScheduler used to use procstate foreground state to decide whether
to exempt jobs, but it should use UID's active state instead, so that
if apps in the temp-whitelist schedule jobs, they run immediately.

Test: Boot
Test: atest CtsAlarmManagerTestCases
Test: atest CtsJobSchedulerTestCases
Test: atest CtsBatterySavingTestCases
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/AppStateTrackerTest.java

Bug: 72125364
Change-Id: I7a5628e76121199f3a5299e2a5576e1481574a6e
2018-02-09 15:39:20 -08:00
nharold
43699e90f3 Merge "Require NETWORK_STACK Permission for IpSec Tunnel Mode" 2018-02-09 23:36:59 +00:00
chaviw
4d133725d4 Prevent setting negative alpha for dim animations.
When apply in the dim animation is called, the currentPlayTime value can
be greater than the total duration. If that's the case, the alpha
value would be set to a negative value. Instead, if the currentPlayTime is
greater than duration, just set the final alpha value.

Change-Id: I77b7c512cc8832c2a31e20d49c14550da2cff7cd
Fixes: 73152600
Test: No more flashing dim
2018-02-09 15:23:45 -08:00
Nick Butcher
ea296350be Merge "Prevent AAPT from versioning <animated-selector> tags." into oc-mr1-dev am: 35e1410551
am: 0ac5791e9e

Change-Id: Idbcf3a51211a87574bd4aff8d01fb49e504b3981
2018-02-09 23:11:17 +00:00
Pavlin Radoslavov
9fa3152636 Use proper string formatting for the "Active device" string
* The hard-coded "active" / "active(media)" / "active(phone)" strings
  are removed and replaced with proper XML-based string formatting.
* Added the appropriate strings for Bluetooth Audio Active Device status:
  "bluetooth_audio_active_device_summaries". For now those strings are
  marked as translatable="false" until the actual UI is finalized.
* Updated all "bluetooth_connected*" strings to include the new
  "active_device" component.
* Added unit tests for the new "active" strings.
  Also, updated existing unit tests to check the getConnectionSummary()
  strings by comparing against strings embedded within the unit tests.

Bug: 72317067
Test: Unit tests added: make RunSettingsLibRoboTests -j40
      Manual: two headsets and switching the active device
Change-Id: Ide639b5dfb45c1db8114155240f193249aeaf3be
(cherry picked from commit e6e080ff5cb9c7c56003695c1b787981e0114599)
2018-02-09 14:59:37 -08:00
TreeHugger Robot
eb50aec148 Merge "Add AttributeSet.getAttributeNamespace()." 2018-02-09 22:57:27 +00:00