Commit Graph

301953 Commits

Author SHA1 Message Date
Jeremy Joslin
acbf592683 Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE."
am: 34d46ca94c

Change-Id: I1e6f1751cf3ce690e09e8681c86f744a38c550d6
2017-01-04 21:42:41 +00:00
Treehugger Robot
34d46ca94c Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." 2017-01-04 21:35:04 +00:00
jackqdyulei
9cbffcba23 Remove hardcoded color for tuner and emergency call
1. Add tint color for icon tuner
2. Remove hardcoded color for emergency call in styles.xml

Bug: 32592245
Test: manual - Take a screenshot
Change-Id: I64de3f95506ac977cc30726305a79e0024b5bd17
2017-01-04 13:33:42 -08:00
Jeremy Joslin
97e711139d Defining a new REQUEST_NETWORK_SCORES permission.
This is intended to be a drop-in replacement for the existing
BROADCAST_NETWORK_PRIVILEGED with a more appropriate name.

Test: Built, ran.
BUG: 33752149
Change-Id: Iebe9d1c12f159bd91953ef094d9866eba9ff925a
Merged-In: I12bdba9694fdf2a2e39990736265919edafd865e
2017-01-04 13:30:07 -08:00
Jeremy Joslin
b17a5edb65 Fix NetworkScoreServiceTest.testSystemRunning.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 33905890
Change-Id: Icc1db79cde26f1445ca925780ff760b7aa0515b1
Merged-In: Idc92fe3669b0efdb20d3899ce4ce7bae70033aff
2017-01-04 13:25:58 -08:00
Andrew Sapperstein
388ef5df44 Merge "Added alert icon to high temp dialog." 2017-01-04 21:08:38 +00:00
Jason Monk
26bc8996c8 Add notifications for incorrect plugin versions
Test: runtest systemui
Change-Id: Ic59a583202a8a20fbfc6fb504e6ab60ecc71ce78
2017-01-04 15:57:30 -05:00
TreeHugger Robot
243d13bd5c Merge "Require APK Signature Scheme v2 for ephemeral APKs" 2017-01-04 20:52:33 +00:00
TreeHugger Robot
c587433dd1 Merge "Introducing teleportation between sections." 2017-01-04 20:43:44 +00:00
Amith Yamasani
ab9ad195d1 Track background sensor usage
Keep an additional counter for background access
of sensors. Increment the count when sensor is
accessed while process is in the background state.

Bug: 33553631
Test: runtest -x frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsSensorTest.java
Change-Id: I87d7dbdaf4c34aa9dd9c7e13134d8f5f759f4e2b
2017-01-04 12:34:57 -08:00
Joe LaPenna
467085866f Merge "Expose RecommendationRequest.Builder as SystemApi." am: 944b017031 am: 1c4cfe1af9 am: 303b853671
am: bb879cedc7  -s ours

Change-Id: I190e23de3f5e6704edb69d4216b20410354df4cc
2017-01-04 20:04:19 +00:00
TreeHugger Robot
6e3c246e2b Merge "Fix typo in comment in IAudioService.aidl" 2017-01-04 20:02:28 +00:00
Joe LaPenna
bb879cedc7 Merge "Expose RecommendationRequest.Builder as SystemApi." am: 944b017031 am: 1c4cfe1af9
am: 303b853671

Change-Id: Ic35415f7d7b721faf09f9968cb2fd8e9ba6749b0
2017-01-04 19:58:56 +00:00
Derek Sollenberger
b29b16e542 Remove clipRegion from the public API.
This API is difficult to support for printing and has other negative
effects as it does not respect the current matrix/clip.

Test: compile
Bug: 14650725
Change-Id: I71f9bd687d446c7ce8910d755421aad8e09458db
2017-01-04 14:57:43 -05:00
Joe LaPenna
303b853671 Merge "Expose RecommendationRequest.Builder as SystemApi." am: 944b017031
am: 1c4cfe1af9

Change-Id: I094905e8fa7f54f4f5f0be80fa833ca44654f334
2017-01-04 19:54:32 +00:00
TreeHugger Robot
64593c6993 Merge "Defining a new REQUEST_NETWORK_SCORES permission." 2017-01-04 19:51:50 +00:00
Joe LaPenna
1c4cfe1af9 Merge "Expose RecommendationRequest.Builder as SystemApi."
am: 944b017031

Change-Id: If63881b8b33ced7950ebb7e83fb8994e454b8642
2017-01-04 19:49:35 +00:00
TreeHugger Robot
a9d0cfbcc9 Merge "Always place stacks below pinned stack" 2017-01-04 19:48:32 +00:00
Jeremy Joslin
c02fd4ea78 Use the new BIND_NETWORK_RECOMMENDATION_SERVICE.
Declare that the system uses the new
BIND_NETWORK_RECOMMENDATION_SERVICE permission.

Test: Built & ran
BUG: 33897544
Change-Id: I43424642a631f58da3a065f8221e351180f4f221
Merged-In: I41c7550adf0d1f81ed9a12068ba569e6a57f3b42
2017-01-04 11:46:06 -08:00
Allen Hair
1f556e3ba6 Provide a mechanism for dumping code coverage for the system server.
This service will only be enabled if the platform was built with
EMMA_INSTRUMENT=true

Test: Manual
Bug: 31077138
Change-Id: I4ba98b6568d31ded1b66da996b3c2e5a2ee07c75
2017-01-04 19:44:21 +00:00
Treehugger Robot
944b017031 Merge "Expose RecommendationRequest.Builder as SystemApi." 2017-01-04 19:42:17 +00:00
TreeHugger Robot
f2acf9df65 Merge "Fix custom pointer icon caching in ViewRootImpl" 2017-01-04 19:35:14 +00:00
Alex Klyubin
abbc2badf5 Require APK Signature Scheme v2 for ephemeral APKs
This makes Package Manager require APK Signature Scheme v2 signatures
for ephemeral APKs. This part of the effort to deprecate the v1
signature scheme based on JAR signing.

Test: cts-tradefed run singleCommand cts --skip-device-info --skip-preconditions --skip-connectivity-check --abi arm64-v8a --module CtsAppSecurityHostTestCases -t android.appsecurity.cts.PkgInstallSignatureVerificationTest
Bug: 33700225
Change-Id: I3b408487c07085c0a7924d3eca495bdcb344b32d
2017-01-04 11:28:47 -08:00
Marie Janssen
e6a0583bc3 Merge "Bluetooth: don't output dumpsys info twice" am: c77074300b am: fde6c2a4af am: fd853576c5
am: bc45e02684

Change-Id: I5aeea3979a9cd530e7324ce63a7ca7581648a371
2017-01-04 19:27:59 +00:00
Andrew Sapperstein
e26dc3d194 Added alert icon to high temp dialog.
Test: manual
Bug: 30995038
Change-Id: I966294c5fb0b8297b2f336102996291f66c08d2c
2017-01-04 11:25:20 -08:00
Marie Janssen
bc45e02684 Merge "Bluetooth: don't output dumpsys info twice" am: c77074300b am: fde6c2a4af
am: fd853576c5

Change-Id: Ibd7eb23ffd10afc749dceb977683c02a5b5344fc
2017-01-04 19:23:24 +00:00
Marie Janssen
fd853576c5 Merge "Bluetooth: don't output dumpsys info twice" am: c77074300b
am: fde6c2a4af

Change-Id: I53c6c777cac8eb129ba1a4a08e81a496deb31c44
2017-01-04 19:18:31 +00:00
Andrew Sapperstein
9625b4fce1 Merge changes from topics 'thermal-notif-2', 'thermal-notif'
* changes:
  Add VR mode check for thermal notification
  Show notif when device reaches throttling temp
2017-01-04 19:18:24 +00:00
Marie Janssen
fde6c2a4af Merge "Bluetooth: don't output dumpsys info twice"
am: c77074300b

Change-Id: I727ed233944a18565e7286bfe0a8d7832a2be962
2017-01-04 19:13:57 +00:00
Marie Janssen
c77074300b Merge "Bluetooth: don't output dumpsys info twice" 2017-01-04 19:07:18 +00:00
Marie Janssen
f5ec538f27 Bluetooth: don't output dumpsys info twice
Dumpsys info was printed in the "Application Services" section as well
as the bluetooth_manager section.  Add an argument to print so it prints
from here, and doesn't in the other section.

Test: run a bugreport, check in "APP SERVICES" section
Bug: 29356402
Change-Id: I8adedaeac54c9a538c581459654dbdf96361e046
2017-01-04 11:06:27 -08:00
Makoto Onuki
45d66bb1bf Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev am: 2258e5fdb9
am: b53de541b2  -s ours

Change-Id: I983a609fb5c6ae9d4f13652fe7172546cf46c719
2017-01-04 19:05:37 +00:00
Makoto Onuki
8915af03a8 Get account features before taking lock (cherry-pick from master) am: fd24353d75
am: 86d1eb9b4b  -s ours

Change-Id: Ifcde7fa530cbdac037d068342a72bdff765a6a63
2017-01-04 19:04:27 +00:00
Makoto Onuki
cbfec5d491 Follow-up to I1e4dd97
Don't check the accounts when the caller is not ADB.

MR2 already has this change.

Test: cts-tradefed run cts --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.AccountCheckHostSideTest
* without having Id49f2bd5dfa80ecf35b3a23c789100ade38c2656 *

Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests
Change-Id: I654c41d0e7434c5fce75eb2df5fd7686a54e9093
2017-01-04 11:01:29 -08:00
Makoto Onuki
b53de541b2 Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev
am: 2258e5fdb9

Change-Id: Ieb15cc47f1db3ff805a91615d64bbe2c23d914ea
2017-01-04 19:00:06 +00:00
Makoto Onuki
86d1eb9b4b Get account features before taking lock (cherry-pick from master)
am: fd24353d75

Change-Id: I4d89f492d4186f14516f93be800a6548127be921
2017-01-04 18:59:55 +00:00
TreeHugger Robot
2258e5fdb9 Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev 2017-01-04 18:54:07 +00:00
TreeHugger Robot
d61d501a06 Merge "Player activity notification: move some intialization server-side" 2017-01-04 18:37:43 +00:00
Amith Yamasani
8a86825e7e Merge "Fix for race in writeToParcel and unparcel" 2017-01-04 18:23:38 +00:00
Sunny Goyal
a532c3ff8c Merge "AppWidgetManager: direct add widget support." 2017-01-04 18:21:38 +00:00
Jean-Michel Trivi
359b91dc68 Fix typo in comment in IAudioService.aidl
Test: none, typo in comment
Change-Id: I6f8803d3d551649fc322414980b2b4bf7d437d9d
2017-01-04 10:20:14 -08:00
TreeHugger Robot
45b2070637 Merge "Added a deprecation warning to AM.requestBugReport()" 2017-01-04 18:19:56 +00:00
Joe LaPenna
010e8b0dc8 Expose RecommendationRequest.Builder as SystemApi.
In order to test our recommender, we need to be able to create
network recommendation requests.

Test: make update-api
Change-Id: I68df0d3e684bcdb90709a34478d2aa669ee23547
Merged-In: I68df0d3e684bcdb90709a34478d2aa669ee23547
2017-01-04 10:15:52 -08:00
Tao Bai
2bb0099b0a Merge "WebView: Add the definition of crash API." 2017-01-04 18:08:28 +00:00
Andrii Kulian
cd5dcb8b3d Always place stacks below pinned stack
When positioning or adding stacks we must make sure
that no stack is above pinned stack.

Bug: 34049027
Test: runtest frameworks-services -c com.android.server.wm.TaskStackContainersTests
Change-Id: Ic92a4e07e9cde42deed53912ac1419fde4ab2f08
2017-01-04 09:56:27 -08:00
Joe LaPenna
3eca29e119 Merge "Expose RecommendationRequest.Builder as SystemApi." 2017-01-04 17:50:08 +00:00
qinzhichao
e5fb79bb2d Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2 am: 15c9c1f8d1 am: 80713e98f7
am: cec9c42498

Change-Id: I19ca9ac969eca57981fd00dcc89f6fa1c724650a
2017-01-04 17:41:53 +00:00
qinzhichao
cec9c42498 Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2 am: 15c9c1f8d1
am: 80713e98f7

Change-Id: Idbc93cea10adc0077341015ecd479baa76ae2c76
2017-01-04 17:37:17 +00:00
qinzhichao
80713e98f7 Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2
am: 15c9c1f8d1

Change-Id: I313f483e69e098252cf1b753aa5f6b38945d9669
2017-01-04 17:32:20 +00:00
qinzhichao
15c9c1f8d1 Merge "Fix NullPointerException in MediaPlayer"
am: c7c899bbe2

Change-Id: Iff261e6bd78c4f757ee0f7ae199710c9f92f0778
2017-01-04 17:27:48 +00:00