OSDN Git Service
Seigo Nonaka [Mon, 28 Nov 2016 07:24:14 +0000 (16:24 +0900)]
Introduce full justification.
Adds a new get/setJustify API to TextView and StaticLayout.Builder for
justification, and fully justifies text when it's enabled.
This is based on a patch by Raph Levien (raph@google.com).
Bug:
31707212
Test: Manually done and CTS will introduced with
I0f3bbf39d60a66b71b30e1351f7c741208f05dce passes.
Change-Id: Icbfab2faa11a6a0b52e6f0a77a9c9b5ef6e191da
Steven Moreland [Wed, 4 Jan 2017 23:46:51 +0000 (23:46 +0000)]
Merge "Return<*> getStatus().isOk() -> isOk()"
Jeremy Joslin [Wed, 4 Jan 2017 23:25:17 +0000 (23:25 +0000)]
Merge "Defining a new REQUEST_NETWORK_SCORES permission." am:
a54d76a81f am:
84fd1e1120 am:
195ac87578
am:
afc31dfe0f -s ours
Change-Id: I609bbca2e676837f2433e6d8ee55b0d8f863c865
Julius D'souza [Wed, 4 Jan 2017 23:20:43 +0000 (23:20 +0000)]
Merge "Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am:
b60eb1a854 am:
d559cb8124" into nyc-mr2-dev-plus-aosp
am:
c0177f8772 -s ours
Change-Id: I797513f3072baf1e77ea502f2b03c0de734eb232
Julius D'souza [Wed, 4 Jan 2017 23:20:36 +0000 (23:20 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am:
b60eb1a854 am:
d559cb8124
am:
3382eed560 -s ours
Change-Id: Ia0711babeba3b0c6b47b6a2166202bb345fe114b
Jeremy Joslin [Wed, 4 Jan 2017 23:20:17 +0000 (23:20 +0000)]
Merge "Defining a new REQUEST_NETWORK_SCORES permission." am:
a54d76a81f am:
84fd1e1120
am:
195ac87578
Change-Id: I1f6de46c521a232c1a218e3e6b50883ea6e150b0
Julius D'souza [Wed, 4 Jan 2017 23:18:54 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am:
bbfdf7ad23 am:
54a0faa37b" into nyc-mr2-dev-plus-aosp
am:
8433ec815b -s ours
Change-Id: I618705be4aabd249145093679106695290289981
Julius D'souza [Wed, 4 Jan 2017 23:18:50 +0000 (23:18 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am:
bbfdf7ad23 am:
54a0faa37b
am:
7e8cbefcf1 -s ours
Change-Id: I18b0193d947b173076f9d2662f943d43a9670b90
Julius D'souza [Wed, 4 Jan 2017 23:17:44 +0000 (23:17 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am:
b60eb1a854 am:
da8462aa5b
am:
1364904c55 -s ours
Change-Id: I720b212e16f6df6c5215ae529050b1b5a84a0900
Jeremy Joslin [Wed, 4 Jan 2017 23:16:38 +0000 (23:16 +0000)]
Merge "Defining a new REQUEST_NETWORK_SCORES permission." am:
a54d76a81f
am:
84fd1e1120
Change-Id: I85279a0185d9191bf81e1088d68f86827fe2d103
Julius D'souza [Wed, 4 Jan 2017 23:16:36 +0000 (23:16 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am:
bbfdf7ad23 am:
8366e50043
am:
d1d68b6597 -s ours
Change-Id: Ifd30fb62fa65562962bc3671a22716a06574c6f3
Android Build Merger (Role) [Wed, 4 Jan 2017 23:13:29 +0000 (23:13 +0000)]
Merge "Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am:
b60eb1a854 am:
d559cb8124" into nyc-mr2-dev-plus-aosp
Julius D'souza [Wed, 4 Jan 2017 23:12:50 +0000 (23:12 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am:
b60eb1a854
am:
d559cb8124
Change-Id: Ia17370de250385171f6ff6b93eb3a59a4347f5a0
Android Build Merger (Role) [Wed, 4 Jan 2017 23:12:30 +0000 (23:12 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am:
bbfdf7ad23 am:
54a0faa37b" into nyc-mr2-dev-plus-aosp
Julius D'souza [Wed, 4 Jan 2017 23:11:51 +0000 (23:11 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am:
bbfdf7ad23
am:
54a0faa37b
Change-Id: I30a13868896713fe71697608f200dad264b5d4c4
Julius D'souza [Wed, 4 Jan 2017 23:11:46 +0000 (23:11 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev am:
b60eb1a854
am:
da8462aa5b
Change-Id: I537e98e43c61868d156439383ee21a06b3dc2b41
Julius D'souza [Wed, 4 Jan 2017 23:10:46 +0000 (23:10 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode. am:
bbfdf7ad23
am:
8366e50043
Change-Id: I40341da2fe7c3e8e5129e647666eaf1860a2e522
Jeremy Joslin [Wed, 4 Jan 2017 23:10:42 +0000 (23:10 +0000)]
Merge "Defining a new REQUEST_NETWORK_SCORES permission."
am:
a54d76a81f
Change-Id: I4fc03585c4943712f5c1309a5bfa2995dac1bbe0
Android Build Merger (Role) [Wed, 4 Jan 2017 23:09:30 +0000 (23:09 +0000)]
Merge "Merge "Fix NetworkScoreServiceTest.testSystemRunning." am:
5b4aec1dc6 am:
01828eb244 am:
b68823cab8 am:
0872235d4c -s ours"
Jeremy Joslin [Wed, 4 Jan 2017 23:08:46 +0000 (23:08 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning." am:
5b4aec1dc6 am:
01828eb244 am:
b68823cab8
am:
0872235d4c -s ours
Change-Id: I05cc72e28a691b3b8f92fa06706e6e3c189ec1bd
Allen Hair [Wed, 4 Jan 2017 23:08:25 +0000 (23:08 +0000)]
Merge "Provide a mechanism for dumping code coverage for the system server."
TreeHugger Robot [Wed, 4 Jan 2017 23:08:12 +0000 (23:08 +0000)]
Merge "Fixing return type check when expanding via menu."
Julius D'souza [Wed, 4 Jan 2017 23:05:48 +0000 (23:05 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev
am:
b60eb1a854
Change-Id: I09803955b09d3dec66bca8e4fed6f21fe18aa7d6
Julius D'souza [Wed, 4 Jan 2017 23:05:45 +0000 (23:05 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev
am:
b60eb1a854
Change-Id: I86ef53eec2bbeff07c52e079e925719c3923941c
Julius D'souza [Wed, 4 Jan 2017 23:05:42 +0000 (23:05 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode.
am:
bbfdf7ad23
Change-Id: Iafc7d24b276db9b145709e7af80e03292c1ce735
Julius D'souza [Wed, 4 Jan 2017 23:05:41 +0000 (23:05 +0000)]
DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode.
am:
bbfdf7ad23
Change-Id: Ic6b72d6b72df516d4cec3b7a38e12366f7e334a1
Treehugger Robot [Wed, 4 Jan 2017 23:04:46 +0000 (23:04 +0000)]
Merge "Defining a new REQUEST_NETWORK_SCORES permission."
Jeremy Joslin [Wed, 4 Jan 2017 23:02:45 +0000 (23:02 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning." am:
5b4aec1dc6 am:
01828eb244
am:
b68823cab8
Change-Id: I19f5c7179a489e992356f141314582abc803ad2e
Julius D'souza [Wed, 4 Jan 2017 22:59:57 +0000 (22:59 +0000)]
Merge "DO NOT MERGE: Allow regular ambient light sensor sampling in doze mode." into cw-f-dev
Jeremy Joslin [Wed, 4 Jan 2017 22:58:52 +0000 (22:58 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning." am:
5b4aec1dc6
am:
01828eb244
Change-Id: I094906527e9baf20f6bcb844f261d0fdcb8f6aa6
Jeremy Joslin [Wed, 4 Jan 2017 22:53:12 +0000 (22:53 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning."
am:
5b4aec1dc6
Change-Id: Ic80d796221d94a092ed210dde3d1e3886d950265
Treehugger Robot [Wed, 4 Jan 2017 22:43:34 +0000 (22:43 +0000)]
Merge "Fix NetworkScoreServiceTest.testSystemRunning."
TreeHugger Robot [Wed, 4 Jan 2017 22:21:12 +0000 (22:21 +0000)]
Merge "Add notifications for incorrect plugin versions"
Makoto Onuki [Wed, 4 Jan 2017 21:59:46 +0000 (21:59 +0000)]
Merge "Follow-up to I1e4dd97"
Jeremy Joslin [Wed, 4 Jan 2017 21:57:11 +0000 (21:57 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am:
34d46ca94c am:
acbf592683 am:
cb3f75cca7
am:
6a848fdf09 -s ours
Change-Id: I5f94537db2313fab72d363c9e4f78e9ac3379a67
Jeremy Joslin [Wed, 4 Jan 2017 21:52:11 +0000 (21:52 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am:
34d46ca94c am:
acbf592683
am:
cb3f75cca7
Change-Id: I0da58029bb854a7df7bc286a0bd6a22c61d5daee
Jeremy Joslin [Wed, 4 Jan 2017 21:47:42 +0000 (21:47 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE." am:
34d46ca94c
am:
acbf592683
Change-Id: Ic488962a47eecea4c2ed522596549ef088bfbfc3
Jeremy Joslin [Wed, 4 Jan 2017 21:42:41 +0000 (21:42 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE."
am:
34d46ca94c
Change-Id: I1e6f1751cf3ce690e09e8681c86f744a38c550d6
Treehugger Robot [Wed, 4 Jan 2017 21:35:03 +0000 (21:35 +0000)]
Merge "Use the new BIND_NETWORK_RECOMMENDATION_SERVICE."
Jeremy Joslin [Wed, 21 Dec 2016 22:16:19 +0000 (14:16 -0800)]
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
Jeremy Joslin [Thu, 29 Dec 2016 23:00:23 +0000 (15:00 -0800)]
Fix NetworkScoreServiceTest.testSystemRunning.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33905890
Change-Id: Icc1db79cde26f1445ca925780ff760b7aa0515b1
Merged-In: Idc92fe3669b0efdb20d3899ce4ce7bae70033aff
Andrew Sapperstein [Wed, 4 Jan 2017 21:08:34 +0000 (21:08 +0000)]
Merge "Added alert icon to high temp dialog."
Jason Monk [Wed, 4 Jan 2017 19:17:47 +0000 (14:17 -0500)]
Add notifications for incorrect plugin versions
Test: runtest systemui
Change-Id: Ic59a583202a8a20fbfc6fb504e6ab60ecc71ce78
TreeHugger Robot [Wed, 4 Jan 2017 20:52:28 +0000 (20:52 +0000)]
Merge "Require APK Signature Scheme v2 for ephemeral APKs"
TreeHugger Robot [Wed, 4 Jan 2017 20:43:41 +0000 (20:43 +0000)]
Merge "Introducing teleportation between sections."
Joe LaPenna [Wed, 4 Jan 2017 20:04:19 +0000 (20:04 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi." am:
944b017031 am:
1c4cfe1af9 am:
303b853671
am:
bb879cedc7 -s ours
Change-Id: I190e23de3f5e6704edb69d4216b20410354df4cc
TreeHugger Robot [Wed, 4 Jan 2017 20:02:23 +0000 (20:02 +0000)]
Merge "Fix typo in comment in IAudioService.aidl"
Joe LaPenna [Wed, 4 Jan 2017 19:58:56 +0000 (19:58 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi." am:
944b017031 am:
1c4cfe1af9
am:
303b853671
Change-Id: Ic35415f7d7b721faf09f9968cb2fd8e9ba6749b0
Joe LaPenna [Wed, 4 Jan 2017 19:54:32 +0000 (19:54 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi." am:
944b017031
am:
1c4cfe1af9
Change-Id: I094905e8fa7f54f4f5f0be80fa833ca44654f334
TreeHugger Robot [Wed, 4 Jan 2017 19:51:46 +0000 (19:51 +0000)]
Merge "Defining a new REQUEST_NETWORK_SCORES permission."
Joe LaPenna [Wed, 4 Jan 2017 19:49:35 +0000 (19:49 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi."
am:
944b017031
Change-Id: If63881b8b33ced7950ebb7e83fb8994e454b8642
TreeHugger Robot [Wed, 4 Jan 2017 19:48:28 +0000 (19:48 +0000)]
Merge "Always place stacks below pinned stack"
Jeremy Joslin [Thu, 29 Dec 2016 18:18:48 +0000 (10:18 -0800)]
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
Allen Hair [Fri, 11 Nov 2016 23:42:50 +0000 (15:42 -0800)]
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
Treehugger Robot [Wed, 4 Jan 2017 19:42:16 +0000 (19:42 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi."
TreeHugger Robot [Wed, 4 Jan 2017 19:35:10 +0000 (19:35 +0000)]
Merge "Fix custom pointer icon caching in ViewRootImpl"
Alex Klyubin [Wed, 4 Jan 2017 19:28:47 +0000 (11:28 -0800)]
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
Marie Janssen [Wed, 4 Jan 2017 19:27:59 +0000 (19:27 +0000)]
Merge "Bluetooth: don't output dumpsys info twice" am:
c77074300b am:
fde6c2a4af am:
fd853576c5
am:
bc45e02684
Change-Id: I5aeea3979a9cd530e7324ce63a7ca7581648a371
Andrew Sapperstein [Wed, 4 Jan 2017 19:25:20 +0000 (11:25 -0800)]
Added alert icon to high temp dialog.
Test: manual
Bug:
30995038
Change-Id: I966294c5fb0b8297b2f336102996291f66c08d2c
Marie Janssen [Wed, 4 Jan 2017 19:23:24 +0000 (19:23 +0000)]
Merge "Bluetooth: don't output dumpsys info twice" am:
c77074300b am:
fde6c2a4af
am:
fd853576c5
Change-Id: Ibd7eb23ffd10afc749dceb977683c02a5b5344fc
Marie Janssen [Wed, 4 Jan 2017 19:18:31 +0000 (19:18 +0000)]
Merge "Bluetooth: don't output dumpsys info twice" am:
c77074300b
am:
fde6c2a4af
Change-Id: I53c6c777cac8eb129ba1a4a08e81a496deb31c44
Andrew Sapperstein [Wed, 4 Jan 2017 19:18:20 +0000 (19:18 +0000)]
Merge changes from topics 'thermal-notif-2', 'thermal-notif'
* changes:
Add VR mode check for thermal notification
Show notif when device reaches throttling temp
Marie Janssen [Wed, 4 Jan 2017 19:13:57 +0000 (19:13 +0000)]
Merge "Bluetooth: don't output dumpsys info twice"
am:
c77074300b
Change-Id: I727ed233944a18565e7286bfe0a8d7832a2be962
Marie Janssen [Wed, 4 Jan 2017 19:07:18 +0000 (19:07 +0000)]
Merge "Bluetooth: don't output dumpsys info twice"
Marie Janssen [Tue, 3 Jan 2017 19:37:38 +0000 (11:37 -0800)]
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
Makoto Onuki [Wed, 4 Jan 2017 19:05:37 +0000 (19:05 +0000)]
Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev am:
2258e5fdb9
am:
b53de541b2 -s ours
Change-Id: I983a609fb5c6ae9d4f13652fe7172546cf46c719
Makoto Onuki [Wed, 4 Jan 2017 19:04:27 +0000 (19:04 +0000)]
Get account features before taking lock (cherry-pick from master) am:
fd24353d75
am:
86d1eb9b4b -s ours
Change-Id: Ifcde7fa530cbdac037d068342a72bdff765a6a63
Makoto Onuki [Wed, 4 Jan 2017 19:01:29 +0000 (11:01 -0800)]
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
Makoto Onuki [Wed, 4 Jan 2017 19:00:06 +0000 (19:00 +0000)]
Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev
am:
2258e5fdb9
Change-Id: Ieb15cc47f1db3ff805a91615d64bbe2c23d914ea
Makoto Onuki [Wed, 4 Jan 2017 18:59:55 +0000 (18:59 +0000)]
Get account features before taking lock (cherry-pick from master)
am:
fd24353d75
Change-Id: I4d89f492d4186f14516f93be800a6548127be921
TreeHugger Robot [Wed, 4 Jan 2017 18:54:05 +0000 (18:54 +0000)]
Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev
TreeHugger Robot [Wed, 4 Jan 2017 18:37:40 +0000 (18:37 +0000)]
Merge "Player activity notification: move some intialization server-side"
Amith Yamasani [Wed, 4 Jan 2017 18:23:36 +0000 (18:23 +0000)]
Merge "Fix for race in writeToParcel and unparcel"
Sunny Goyal [Wed, 4 Jan 2017 18:21:34 +0000 (18:21 +0000)]
Merge "AppWidgetManager: direct add widget support."
Jean-Michel Trivi [Wed, 4 Jan 2017 18:20:14 +0000 (10:20 -0800)]
Fix typo in comment in IAudioService.aidl
Test: none, typo in comment
Change-Id: I6f8803d3d551649fc322414980b2b4bf7d437d9d
TreeHugger Robot [Wed, 4 Jan 2017 18:19:53 +0000 (18:19 +0000)]
Merge "Added a deprecation warning to AM.requestBugReport()"
Joe LaPenna [Wed, 4 Jan 2017 08:44:22 +0000 (00:44 -0800)]
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
Tao Bai [Wed, 4 Jan 2017 18:08:25 +0000 (18:08 +0000)]
Merge "WebView: Add the definition of crash API."
Andrii Kulian [Wed, 4 Jan 2017 01:09:45 +0000 (17:09 -0800)]
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
Joe LaPenna [Wed, 4 Jan 2017 17:50:05 +0000 (17:50 +0000)]
Merge "Expose RecommendationRequest.Builder as SystemApi."
qinzhichao [Wed, 4 Jan 2017 17:41:53 +0000 (17:41 +0000)]
Merge "Fix NullPointerException in MediaPlayer" am:
c7c899bbe2 am:
15c9c1f8d1 am:
80713e98f7
am:
cec9c42498
Change-Id: I19ca9ac969eca57981fd00dcc89f6fa1c724650a
qinzhichao [Wed, 4 Jan 2017 17:37:17 +0000 (17:37 +0000)]
Merge "Fix NullPointerException in MediaPlayer" am:
c7c899bbe2 am:
15c9c1f8d1
am:
80713e98f7
Change-Id: Idbc93cea10adc0077341015ecd479baa76ae2c76
qinzhichao [Wed, 4 Jan 2017 17:32:20 +0000 (17:32 +0000)]
Merge "Fix NullPointerException in MediaPlayer" am:
c7c899bbe2
am:
15c9c1f8d1
Change-Id: I313f483e69e098252cf1b753aa5f6b38945d9669
qinzhichao [Wed, 4 Jan 2017 17:27:48 +0000 (17:27 +0000)]
Merge "Fix NullPointerException in MediaPlayer"
am:
c7c899bbe2
Change-Id: Iff261e6bd78c4f757ee0f7ae199710c9f92f0778
Treehugger Robot [Wed, 4 Jan 2017 17:23:06 +0000 (17:23 +0000)]
Merge "Fix NullPointerException in MediaPlayer"
Makoto Onuki [Thu, 15 Dec 2016 22:26:55 +0000 (14:26 -0800)]
Get account features before taking lock (cherry-pick from master)
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
Bug:
33481725
Change-Id: Ie2fe9aea87d1a7167581f4cd74ae063ef24a4567
Merged-in: I1e4dd9701a76ca366f86fdaf2fc6c282e9dbe5c1
Kang Li [Wed, 4 Jan 2017 16:09:03 +0000 (16:09 +0000)]
Merge "Log metrics for Smart-Sharing in ChooserActivity."
Kang Li [Wed, 4 Jan 2017 16:08:23 +0000 (16:08 +0000)]
Merge "Rank apps by Logistic Regression for Smart-Sharing."
Android Build Merger (Role) [Wed, 4 Jan 2017 15:43:50 +0000 (15:43 +0000)]
Merge "Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am:
871beedc6d am:
a169fc3494 am:
8be80273b8 am:
a1a9676317 -s ours"
Jeremy Joslin [Wed, 4 Jan 2017 15:43:11 +0000 (15:43 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am:
871beedc6d am:
a169fc3494 am:
8be80273b8
am:
a1a9676317 -s ours
Change-Id: Ibcf0e95528371d868d6799c50285cd99e114b388
TreeHugger Robot [Wed, 4 Jan 2017 15:42:30 +0000 (15:42 +0000)]
Merge "Propagate ephemeral flag from adb install to PackageParser"
Jeremy Joslin [Wed, 4 Jan 2017 15:38:43 +0000 (15:38 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am:
871beedc6d am:
a169fc3494
am:
8be80273b8
Change-Id: I4930b2d6145e5d7f4e08d267629f40517cbeae34
Chris Wren [Wed, 4 Jan 2017 15:38:39 +0000 (15:38 +0000)]
Merge "fix race in getAppActiveNotifications"
Jeremy Joslin [Wed, 4 Jan 2017 15:34:16 +0000 (15:34 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am:
871beedc6d
am:
a169fc3494
Change-Id: I25f816c0ee3df784a02be58a042c505f2c839394
Jeremy Joslin [Wed, 4 Jan 2017 15:29:57 +0000 (15:29 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE."
am:
871beedc6d
Change-Id: I2554ede84b313e66af57e05c59046747c16ec23e
Treehugger Robot [Wed, 4 Jan 2017 15:24:30 +0000 (15:24 +0000)]
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE."
Wyatt Riley [Wed, 4 Jan 2017 14:10:11 +0000 (14:10 +0000)]
Merge "Removing @removed methods and constants"
Neil Fuller [Wed, 4 Jan 2017 12:51:54 +0000 (12:51 +0000)]
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" am:
75ba827a4e am:
6a29676687 am:
df49ab5576
am:
88c9e31fd3
Change-Id: Ia30d6e094db10e479ef5a4d2159c4ca50ce6d9b1
Neil Fuller [Wed, 4 Jan 2017 12:45:11 +0000 (12:45 +0000)]
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" am:
75ba827a4e am:
6a29676687
am:
df49ab5576
Change-Id: I6aac69506e00ec9f0fdb431191a94b7b9b9fc0df
Neil Fuller [Wed, 4 Jan 2017 12:38:50 +0000 (12:38 +0000)]
Merge "Set isConnected, isBound, implCreated on server-side LocalSockets" am:
75ba827a4e
am:
6a29676687
Change-Id: Icb55f2b160f6bd2f6c12845613ea3b4ea834693d
OSDN Git Service
