OSDN Git Service
Andrii Kulian [Sat, 12 Aug 2017 06:22:20 +0000 (06:22 +0000)]
Merge "Update background crop animation threshold" into oc-dr1-dev
am:
79e11e4429
Change-Id: I6fada8610ecbce5dc31683e7a3a0f4072a3e6ced
TreeHugger Robot [Sat, 12 Aug 2017 06:09:06 +0000 (06:09 +0000)]
Merge "Update background crop animation threshold" into oc-dr1-dev
Ian Pedowitz [Sat, 12 Aug 2017 05:38:40 +0000 (05:38 +0000)]
Merge changes from topic 'b/
64606807' into oc-dr1-dev
am:
8193291ca3 -s ours
Change-Id: Ia1b92d79e68c93616321512f00da671c912df1a3
TreeHugger Robot [Sat, 12 Aug 2017 05:30:30 +0000 (05:30 +0000)]
Merge changes from topic 'b/
64606807' into oc-dr1-dev
* changes:
Revert "Add (disabled) time zone update system server impl"
Revert "Time zone update API classes"
Neil Fuller [Sat, 12 Aug 2017 04:00:36 +0000 (04:00 +0000)]
Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev
am:
a031b0d6a1
Change-Id: I1a1a6468921ca5e23cc250aacb713153433917a3
TreeHugger Robot [Sat, 12 Aug 2017 03:50:02 +0000 (03:50 +0000)]
Merge "Move DISABLE_INPUT_DEVICE permission" into oc-dr1-dev
Dan Sandler [Sat, 12 Aug 2017 03:19:20 +0000 (03:19 +0000)]
Move USE_COLORIZED_NOTIFICATIONS to com.android.
am:
708a1ca16a -s ours
Change-Id: Id53497b5a1bacb4bdfb8adcc1c359bffa1b56d5a
Dan Sandler [Sat, 12 Aug 2017 00:30:24 +0000 (20:30 -0400)]
Move USE_COLORIZED_NOTIFICATIONS to com.android.
It's @hidden, but CTS needs it to be out of the android.*
namespace too.
Fixes:
64613274
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: I753c2cc19111f9ed39e7fc3e006aab096c733ddc
Merged-In: I2046ae17b9e89ac0a83e182b91422fd242bc7557
Neil Fuller [Sat, 12 Aug 2017 00:09:41 +0000 (01:09 +0100)]
Move DISABLE_INPUT_DEVICE permission
Move DISABLE_INPUT_DEVICE permission out of the
reserved android namespace until the next API
version. It appears to be mostly unused.
Fixes:
64615722
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: If77fd9e5c0eede418fa14a37e5e895fee5667576
Merged-In: Ic98af7e3953da63c3c49bfd38d8cfd0ff0646869
Ian Pedowitz [Fri, 11 Aug 2017 22:12:00 +0000 (15:12 -0700)]
Revert "Add (disabled) time zone update system server impl"
This reverts commit
328532ab13768a6303231b670708d750c4d7aa5f.
Fixes:
64606807
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: Iab0fd111803ae9e7615a3b2c825bbe8d84e29edf
Merged-In: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
Ian Pedowitz [Fri, 11 Aug 2017 21:23:17 +0000 (14:23 -0700)]
Revert "Time zone update API classes"
This reverts commit
fe6ec56cce981731be7d0bc0e61a0411d0a0d2cf.
Fixes:
64606807
Test: Grab the cts binaries(android-cts.zip) from OC Release
Test: Extract and from android-cts/tools directory, launch ./cts-tradefed
Test: On the DUT with CL cherrypicked, run the below(will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered doesn't fail for android namespace:android.permission.TRIGGER_TIME_ZONE_RULES_CHECK
Change-Id: I238e2b6fa7ce60e6a8cbfebcd13e5e4c596834af
Merged-In: I31b55e88072dd73055cb3d8cf252be6eac920322
Andrii Kulian [Sat, 12 Aug 2017 01:01:11 +0000 (18:01 -0700)]
Update background crop animation threshold
Empiric value for animation epsilon covers only the last
frame of the animation, which is not enough in some case.
This CL makes it a little bigger to cover two last frames.
The change is visually indistinguishable for user.
Bug:
63156733
Test: Go to/from recents with letterboxed app.
Change-Id: I42423527688dcb2dc157ae16bbe5b6de7eee3449
Adrian Roos [Fri, 11 Aug 2017 23:59:44 +0000 (23:59 +0000)]
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev
am:
1cbfe74fc2
Change-Id: Id1b46b3c77f0cb2213afa38ba3e6608f091c4d8b
TreeHugger Robot [Fri, 11 Aug 2017 23:43:11 +0000 (23:43 +0000)]
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev
Andrii Kulian [Fri, 11 Aug 2017 23:39:59 +0000 (23:39 +0000)]
Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev
am:
cff260adfc
Change-Id: I94b462f38ead5fb7e2253604ad4437c7a5670e4c
Andrii Kulian [Fri, 11 Aug 2017 23:31:44 +0000 (23:31 +0000)]
Merge "Don't animate black background on cold launch from launcher" into oc-dr1-dev
Steven Moreland [Fri, 11 Aug 2017 22:17:51 +0000 (22:17 +0000)]
Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master am:
e59c1b1b50
am:
bc6d35e698
Change-Id: Ida9cc1c9c2a64920ce094f2305e2e7bc1abaec1b
Android Build Merger (Role) [Fri, 11 Aug 2017 22:13:04 +0000 (22:13 +0000)]
Merge "Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev am:
7b0dec4142" into oc-dr1-dev-plus-aosp
Makoto Onuki [Fri, 11 Aug 2017 22:08:15 +0000 (22:08 +0000)]
Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev
am:
7b0dec4142
Change-Id: Iebb109a246b174b6659abed862909b43ddcce74b
Steven Moreland [Fri, 11 Aug 2017 22:06:57 +0000 (22:06 +0000)]
Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master am:
e17aa09136
am:
1c7ae6507e
Change-Id: I31224c1a0bef8074c4d569137b3134d28039ee58
Steven Moreland [Fri, 11 Aug 2017 21:59:58 +0000 (21:59 +0000)]
Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master
am:
e59c1b1b50
Change-Id: Ic38b5d25594949241467f4271475e9f4503397b1
Android Build Merger (Role) [Fri, 11 Aug 2017 21:53:08 +0000 (21:53 +0000)]
Merge "Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev am:
84626a4e3d" into oc-dr1-dev-plus-aosp
Steven Moreland [Fri, 11 Aug 2017 21:51:12 +0000 (21:51 +0000)]
Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master
am:
e17aa09136
Change-Id: Ic9b83ef13c9063f70c1d8af6ab95085f17afa4be
Jason Monk [Fri, 11 Aug 2017 21:44:46 +0000 (21:44 +0000)]
Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev
am:
84626a4e3d
Change-Id: I7bcd02a6eeefd326d6f719ea3052674ecf2a1529
Android Build Merger (Role) [Fri, 11 Aug 2017 21:43:59 +0000 (21:43 +0000)]
Merge "Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
f125024688" into oc-dr1-dev-plus-aosp
Steven Moreland [Fri, 11 Aug 2017 21:41:00 +0000 (21:41 +0000)]
Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master
Cindy Kuang [Fri, 11 Aug 2017 21:38:58 +0000 (21:38 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2
am:
f125024688
Change-Id: I3722fb9dc286ca00da780ba15346ea0a88ea6d3e
Steven Moreland [Fri, 11 Aug 2017 21:38:39 +0000 (21:38 +0000)]
Revert "aapt2_jni: use proper nativehelper headers"
This reverts commit
8eebd694e59fb01c13267c509ea98179f149e69b.
Reason for revert: TH skipped PS run
Change-Id: Iab0e71d985819880146476ba3648e8b94201a839
TreeHugger Robot [Fri, 11 Aug 2017 21:37:06 +0000 (21:37 +0000)]
Merge "WTF when device has no persistent periodic syncs..." into oc-dr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 21:35:31 +0000 (21:35 +0000)]
Merge "aapt2_jni: use proper nativehelper headers" into stage-aosp-master
Steven Moreland [Fri, 11 Aug 2017 21:33:42 +0000 (21:33 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594 am:
e04a0bf5c7
am:
99cb134bf2 -s ours
Change-Id: I17668ddde69926f6648d75f2b74f54f234fc5c02
Adrian Roos [Fri, 11 Aug 2017 17:43:17 +0000 (19:43 +0200)]
AOD: Fix navbar flicker when transitioning to AOD
Under certain circumstances, the transition to AOD can happen before
the navigation bar gets a chance to hide itself, which happens in a
traversal. To work around this, post turning the screen on such that
it only happens after the next traversal.
Change-Id: I178b9394e7cc6baa8e9552c9819c3ce9b044defb
Fixes:
64599221
Test: Open Whatsapp / Gmail, turn off screen, verify navbar does not flicker.
Android Build Merger (Role) [Fri, 11 Aug 2017 21:26:53 +0000 (21:26 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-dr1-dev-plus-aosp
Steven Moreland [Fri, 11 Aug 2017 21:24:02 +0000 (21:24 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594
am:
e04a0bf5c7
Change-Id: I3e4e01a5e328ede527ee49d36ac828205994639d
Cindy Kuang [Fri, 11 Aug 2017 21:22:42 +0000 (21:22 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65
am:
07f5257b19
Change-Id: I74c7e7906b4cdcaefc65787ce4d9fcf35a2cecb3
Cindy Kuang [Fri, 11 Aug 2017 21:20:11 +0000 (21:20 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2
am:
e4f02db258
Change-Id: I14c80bbd8838b6af2010463e9d1fb25cf537a167
Jason Monk [Fri, 11 Aug 2017 21:19:04 +0000 (21:19 +0000)]
Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev
Cindy Kuang [Fri, 11 Aug 2017 21:14:33 +0000 (21:14 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
am:
dc12cb1fb2
Change-Id: I297557eb072b1fce0395c93c2a770623b5ba1642
Android Build Merger (Role) [Fri, 11 Aug 2017 21:08:13 +0000 (21:08 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
1e6401b07e" into oc-dr1-dev-plus-aosp
Steven Moreland [Fri, 11 Aug 2017 21:07:06 +0000 (21:07 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers"
am:
75c9e4d594
Change-Id: I170b5846981683eacee1081587c7149bab454d91
Cindy Kuang [Fri, 11 Aug 2017 21:06:56 +0000 (21:06 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
am:
dc12cb1fb2
Change-Id: Ida5507009926a936ee247c2f43f44b439351d937
Cindy Kuang [Fri, 11 Aug 2017 21:01:15 +0000 (21:01 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
am:
0580ac8a65
Change-Id: I094bd99bcaaf51633ac887d38a9323ed5fdc54e2
Pankaj Kanwar [Fri, 11 Aug 2017 21:01:13 +0000 (21:01 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev
am:
bcfa22584b
Change-Id: I4cdef151e4a826cee965954352f101c3bdd86d09
Cindy Kuang [Fri, 11 Aug 2017 21:01:11 +0000 (21:01 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65
am:
1e6401b07e
Change-Id: I48f9a5fc207a2c884e51c9091bd19db9bdf15471
Pankaj Kanwar [Fri, 11 Aug 2017 20:52:52 +0000 (20:52 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev
Cindy Kuang [Fri, 11 Aug 2017 20:45:24 +0000 (20:45 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
am:
0580ac8a65
Change-Id: I7138667ba48fa590c4a7f30cdecf0381c43050a6
Treehugger Robot [Fri, 11 Aug 2017 20:40:35 +0000 (20:40 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers"
Cindy Kuang [Fri, 11 Aug 2017 20:38:35 +0000 (20:38 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
Cindy Kuang [Fri, 11 Aug 2017 20:33:34 +0000 (20:33 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
Steven Moreland [Fri, 11 Aug 2017 20:12:31 +0000 (20:12 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am:
3f378940c2
am:
93d8497094
Change-Id: Ib2a80b747bd1a0c4692a89d17bd96eeb03dbe46e
Steven Moreland [Fri, 11 Aug 2017 20:04:15 +0000 (20:04 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
am:
3f378940c2
Change-Id: Iecb2b1b6ba647b0fe65c538f0a1cdb957e6dbb3e
TreeHugger Robot [Fri, 11 Aug 2017 19:55:19 +0000 (19:55 +0000)]
Merge "Fix android_os_Debug nativehelper headers." into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 11 Aug 2017 19:53:32 +0000 (19:53 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
Makoto Onuki [Fri, 11 Aug 2017 19:11:39 +0000 (12:11 -0700)]
WTF when device has no persistent periodic syncs...
... when it most likely has some.
Bug:
64536115
Test: manual
Change-Id: I24c4c950b0266ef22918156c29384bc452f523af
Tyler Gunn [Fri, 11 Aug 2017 19:03:20 +0000 (19:03 +0000)]
Merge changes from topic 'call-session-may' am:
21e4dbb6ed am:
63769af59d
am:
347e5ff103
Change-Id: I1a53bf75715c4d7d1b2fbd7ebf6dc96c06b78a2f
Tyler Gunn [Fri, 11 Aug 2017 18:47:18 +0000 (18:47 +0000)]
Merge changes from topic 'call-session-may' am:
21e4dbb6ed
am:
63769af59d
Change-Id: I798dc5b56fb8f212153d87e71ac088ba177875b8
Jason Monk [Fri, 11 Aug 2017 16:53:36 +0000 (12:53 -0400)]
Change default temp threshold to use shutdown temp
Base the temp threshold to be based on the shutdown temp lowered
by some amount to ensure the warning can be seen before a shutdown.
Test: runtest systemui
Change-Id: I033a776e874d76018592954932ed5127e1b228ae
Fixes:
62845934
Tyler Gunn [Fri, 11 Aug 2017 18:33:44 +0000 (18:33 +0000)]
Merge changes from topic 'call-session-may'
am:
21e4dbb6ed
Change-Id: I20a3a9f7808211187da8434a0b1490081a92e8d8
Andrii Kulian [Fri, 11 Aug 2017 18:27:00 +0000 (11:27 -0700)]
Don't animate black background on cold launch from launcher
When animating cold start from launcher we can't compute the
progress in SurfaceControlWithBackground#calculateBgCrop() via
tracking status bar insets. This CL won't animate bg crop
in case the progress does not make sense.
Bug:
64598822
Test: Cold launch letterboxed app from launcher.
Change-Id: I82182a3c46dd4f81bcf056d1163f78c450bd9b83
Tyler Gunn [Fri, 11 Aug 2017 18:14:02 +0000 (18:14 +0000)]
Merge changes from topic 'call-session-may'
* changes:
Add callSessionMayHandover API to ImsCallSession.
IMS: Support for Possible Call Session Handover
Steven Moreland [Fri, 11 Aug 2017 18:01:23 +0000 (11:01 -0700)]
aapt2_jni: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using aapt2_jni find headers
Bug:
63762847
Change-Id: Id51354d533bfef66ecd71f5d89599b8adc688c1f
Steven Moreland [Fri, 11 Aug 2017 17:57:59 +0000 (10:57 -0700)]
Fix android_os_Debug nativehelper headers.
Test: links
Bug:
63762847
Change-Id: I3936b4b7021597de7289ace62ebf9946d2db339c
Steven Moreland [Fri, 11 Aug 2017 17:52:35 +0000 (10:52 -0700)]
Reference ScopedUtfChar header correctly.
Bug:
63762847
Test: finds header in proper location
Change-Id: I4963ab3133c405a90564112f0d9af602ace0eab5
Tyler Gunn [Fri, 11 Aug 2017 16:24:41 +0000 (09:24 -0700)]
Catch BadParcelableException in RemoteConnection when setting extras.
Unlike the code in Telecom which can use Bundle.setDefusable(..), this
framework code is used within a Connection Manager's code space, so the
setDefusable method does not work.
To prevent crashing the Connection Manager's app, catching the exception
and ignoring extras in this case (not much else we can do).
I've also filed a bug against the offending component known for putting
bad parcelables into the extras.
Test: Modified code to force this scenario.
Bug:
64499462
Change-Id: If44ad2e2c8e285d513969c6babe5a798242da53d
Esteban Talavera [Fri, 11 Aug 2017 12:50:36 +0000 (12:50 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours
am:
b6ba151a6f -s ours
Change-Id: Idc2edc2fe727a5054c2bafb2ab01cbdfdc5a9d71
Esteban Talavera [Fri, 11 Aug 2017 12:42:59 +0000 (12:42 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3
am:
e50bea8662 -s ours
Change-Id: I95659fa0abcfa619a88cb2d3d0e6d2ede4186a53
Esteban Talavera [Fri, 11 Aug 2017 12:34:06 +0000 (12:34 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
am:
49bef543b3
Change-Id: I0183d9fb699f38af155c3684cc74daa875c22ec4
Esteban Talavera [Fri, 11 Aug 2017 12:34:00 +0000 (12:34 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
am:
49bef543b3 -s ours
Change-Id: I69369945e8fc5c1090c8ee217b5d193f5fb1236d
TreeHugger Robot [Fri, 11 Aug 2017 12:25:01 +0000 (12:25 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
Android Build Merger (Role) [Fri, 11 Aug 2017 01:12:50 +0000 (01:12 +0000)]
Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437" into oc-dr1-dev-plus-aosp
Steven Moreland [Fri, 11 Aug 2017 01:08:37 +0000 (18:08 -0700)]
ScopedUtfChars: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using ScopedUtfChars find headers
Bug:
63762847
Merged-In: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Kevin Chyn [Fri, 11 Aug 2017 01:08:09 +0000 (01:08 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
am:
cad75e2437
Change-Id: Iff57ca1a3b59517218085239e23c68a4315230e1
Brad Ebinger [Fri, 11 Aug 2017 01:07:31 +0000 (01:07 +0000)]
Merge "Change IMS callback AIDLs to be oneway" am:
a46600e0e7 am:
44da663308
am:
c6edfb16ac -s ours
Change-Id: I0d3fd87e85541df08541ea3a16dd2ae3b32d9941
TreeHugger Robot [Fri, 11 Aug 2017 00:59:08 +0000 (00:59 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
Brad Ebinger [Fri, 11 Aug 2017 00:55:01 +0000 (00:55 +0000)]
Merge "Change IMS callback AIDLs to be oneway" am:
a46600e0e7
am:
44da663308
Change-Id: I7d68f608242c81c7be1da1c83669baf38b9e9fcc
Brad Ebinger [Fri, 11 Aug 2017 00:42:30 +0000 (00:42 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
am:
a46600e0e7
Change-Id: If849e9ed61271bf233f4e149ef766e2e7b0d7851
TreeHugger Robot [Fri, 11 Aug 2017 00:40:18 +0000 (00:40 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp
Treehugger Robot [Fri, 11 Aug 2017 00:31:41 +0000 (00:31 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
Brad Ebinger [Thu, 10 Aug 2017 23:24:43 +0000 (23:24 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" am:
6ffc855e8d am:
bc13df8ce8
am:
3fff521160 -s ours
Change-Id: I0bf3f2a70920df6c36741ea78220e235d6ed769a
Brad Ebinger [Thu, 27 Jul 2017 19:57:03 +0000 (12:57 -0700)]
Change IMS callback AIDLs to be oneway
A bad behaving service was causing the IMS registration
callbacks to block indefinetly waiting for the callback
binder implementation in another process to finish. Since
we update the IMS registration in a loop, we were never getting
to the updates for the other processes.
This change moves the AIDL definition to oneway. Since these
are callback AIDLs, the caller doesn't need to wait
for the callbacks to return before sending the others.
Bug:
63137625
Test: Manual
Merged-In: I0e049166ddf3604d312748b63a94fa6ebe77c29d
Change-Id: Id39b6b70aa20bb9986bf293abe2f9e683da4252e
Brad Ebinger [Thu, 10 Aug 2017 23:11:44 +0000 (23:11 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" am:
6ffc855e8d
am:
bc13df8ce8
Change-Id: I7d73cade826c47b902c875b9543cb50fb19631d9
Brad Ebinger [Thu, 10 Aug 2017 23:02:56 +0000 (23:02 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
am:
6ffc855e8d
Change-Id: Ifa04b6260d51c17dc323fab918db0bdbf2bdea64
Steven Moreland [Thu, 10 Aug 2017 22:55:12 +0000 (15:55 -0700)]
ScopedUtfChars: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using ScopedUtfChars find headers
Bug:
63762847
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Brad Ebinger [Thu, 10 Aug 2017 22:50:45 +0000 (22:50 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
Phil Weaver [Thu, 10 Aug 2017 22:44:47 +0000 (22:44 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev
am:
a5dab05b61
Change-Id: If2bbb15d9609260272d74e3fc8c7de7c9789fa2d
Phil Weaver [Thu, 10 Aug 2017 22:34:03 +0000 (22:34 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev
Kevin Chyn [Thu, 10 Aug 2017 18:40:37 +0000 (11:40 -0700)]
Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission
Test: make -j56 cts
run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Fixes:
64560640
Change-Id: Ic807028567da9a4f3f108121d3e36358a513cf04
Phil Weaver [Thu, 10 Aug 2017 19:31:34 +0000 (12:31 -0700)]
Stop focusing views before layout.
Rolls back one line of ag/
2257919.
Bug:
63811145
Test: TalkBack no longer reads the page backwards in:
Settings > System > Reset > Factory data reset
Settings > Connected devices > Android Beam
Change-Id: I6b04e64cd650ebda193da4a54bf0721bd256820c
Ian Pedowitz [Thu, 10 Aug 2017 17:46:32 +0000 (17:46 +0000)]
Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
am:
0716c8e60e
Change-Id: I1016361cd17be52a02a21fb4d1da791c0247be1d
Amit Mahajan [Thu, 10 Aug 2017 17:34:07 +0000 (17:34 +0000)]
Merge "The method of parseEfSpdi does not match TS24008." am:
cd03d0db9d am:
cfbd4a354a
am:
1cdd44bd9d
Change-Id: I8ed8d16910331f09a0e44e908e7ac89e990af141
TreeHugger Robot [Thu, 10 Aug 2017 17:32:47 +0000 (17:32 +0000)]
Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
Amit Mahajan [Thu, 10 Aug 2017 17:27:24 +0000 (17:27 +0000)]
Merge "Get isim card data use subId." am:
854edcff16 am:
3466cda3d7
am:
1a808fc019
Change-Id: I27f67b172bd8096ee00b9c80bb9699b33eff97f7
Cindy Kuang [Wed, 9 Aug 2017 17:08:15 +0000 (10:08 -0700)]
docs: replaced "i.e." to fix formatting error
Test: make ds-docs
Bug:
6440865
Change-Id: I428476ddfe55f14df531ea6a1c3e3a09f7a29e7d
Amit Mahajan [Thu, 10 Aug 2017 16:24:56 +0000 (16:24 +0000)]
Merge "The method of parseEfSpdi does not match TS24008." am:
cd03d0db9d
am:
cfbd4a354a
Change-Id: Ic5e764bd0d5ca14498c4b36dd1f2bd9d8ba05544
Amit Mahajan [Thu, 10 Aug 2017 16:20:16 +0000 (16:20 +0000)]
Merge "Get isim card data use subId." am:
854edcff16
am:
3466cda3d7
Change-Id: I84d8b0fd15e50706e59577941428e5f5e81fa373
Amit Mahajan [Thu, 10 Aug 2017 16:12:19 +0000 (16:12 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."
am:
cd03d0db9d
Change-Id: I386f5e4de89c4ac758e1702b2efdc16a43c12c33
Amit Mahajan [Thu, 10 Aug 2017 16:06:36 +0000 (16:06 +0000)]
Merge "Get isim card data use subId."
am:
854edcff16
Change-Id: I0a562f9966838cc6746c170b3bba9a250fd2633b
Amit Mahajan [Thu, 10 Aug 2017 15:59:43 +0000 (15:59 +0000)]
Merge "The method of parseEfSpdi does not match TS24008."
Amit Mahajan [Thu, 10 Aug 2017 15:57:38 +0000 (15:57 +0000)]
Merge "Get isim card data use subId."
Ian Pedowitz [Thu, 10 Aug 2017 02:15:31 +0000 (19:15 -0700)]
Revert "Initial support for proposed android.net.lowpan"
This reverts commit
4e0c2195dd999859f4e79cec1884326fb52a5916.
Fixes:
64111427
Test: Grabbed OC CTS binaries
Test: Extracted android-cts.zip and from android-cts/tools directory launched ./cts-tradefed
Test: On the DUT (running build which has this CL cherrypicked), ran the below (will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: Note, while b/
64111427 is fixed, this uncovered b/
64560640
Change-Id: I1d2132678281a917f03c69d5ead1d28313d7f46d
Merged-In: Icab67ba2c40bc02968e3f8ed2da5a4a3be6cf77f
OSDN Git Service
