*************************************************************** *************************************************************** 6741 file changed, 364945 insertions(+), 67243 deletions(-) *************************************************************** *************************************************************** ========platform/art between android-6.0.1_r46..android-6.0.1_r54========= 9d96bd6 ART: Decrease dex2oat watchdog timeout ========platform/bionic between android-6.0.1_r46..android-6.0.1_r54========= libc/zoneinfo/tzdata | Bin 491711 -> 494261 bytes tests/pthread_test.cpp | 7 +++++++ 2 files changed, 7 insertions(+) 4f80102 Fix potential race condition on CTS TC pthread_gettid_np ========platform/bootable/recovery between android-6.0.1_r46..android-6.0.1_r54========= Android.mk | 1 + minui/graphics_fbdev.cpp | 12 - wear_ui.cpp | 655 +++++++++++++++++++++++++++++++++++++++++++++++ wear_ui.h | 137 ++++++++++ 4 files changed, 793 insertions(+), 12 deletions(-) ec4df63 Fix integer overflows in recovery procedure. a5d5082 Revert "Byte swap to support BGRA in recovery mode" 8e9c680 recovery: Fix the bug that truncates menu entries. 337db14 recovery: Factor out wear_ui.{cpp,h} into bootable/recovery. ========platform/build between android-6.0.1_r46..android-6.0.1_r54========= core/build_id.mk | 2 +- core/product_config.mk | 2 +- core/version_defaults.mk | 31 ++++++++++++------------- target/board/generic/sepolicy/property_contexts | 2 ++ target/product/core.mk | 1 - target/product/core_tiny.mk | 1 + target/product/sdk_phone_arm64.mk | 2 +- target/product/sdk_phone_armv7.mk | 2 +- target/product/sdk_phone_mips.mk | 2 +- target/product/sdk_phone_mips64.mk | 2 +- target/product/sdk_phone_x86.mk | 2 +- target/product/sdk_phone_x86_64.mk | 2 +- tools/releasetools/common.py | 22 +++++++++++++----- tools/releasetools/sparse_img.py | 26 ++++++++++++++++++--- 14 files changed, 65 insertions(+), 34 deletions(-) 567d799 "MTC19Z" 465743b MTC19Y 9134298 "MTC19X" b06bc92 "MTC19W" c1ce5fd Updating security string to 2016-07-05 to release branches f2b21bc MTC19V 1de8491 "MTC19U" 4e6f1e7 Update security patch string to 2016-06-01 3ca0b04 "MTC19T" cb4a4b7 "MTC19S" a83b748 MTC19R be600a2 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA 72e8cda "MTC19Q" 6fe1867 "MTC78" 86f52cc MTC19O b188a8e Set BUILD_ID to use MT 2 letter abbreviation. 3300537 "MHC19N" 70593a0 "MHC19M" 1b865fa "MHC19L" 7e848b3 Updating security string patch to 2016-04-01 5228b92 "MHC19K" 57d06af "MHC19J" 087c6f0 "MHC19I" 4ce2b1d "MHC19H" f02556d "MHC19G" 03b5c5d "MHC19F" 0e99241 "MHC19E" 8dd7085 "MHC19D" c782f95 "MHC19C" 777fab4 "MHC19B" 6c0d423 "MHC19" 28fc15a "MHC18" 7251731 "MHC17" 3d7d858 "MHC15" 9257490 "MHC14C" 9a7d92f "MHC14B" 7cf7588 "MHC14" 46e5844 "MHC13" 1c2c7b6 "MHC12" c24c6cc Updating security patch string to 2016-03-01 56f53d8 "MHC11" 8871d8c "MHC10" 92c9b39 "MHC08" 2e51437 "MHC06" e6e7e2a "MHC05B" b18f384 "MHC05" 9c775ee "MHC04" d6d6135 "MHC03" 051988a "MHB91" 09601bd "MHB90" b905ec4 "MHB89" 1508e31 "MHB88" 00cab88 "MHB84" 4c12b40 "MHB83" 7a6495c "MHB82" 924236a "MHB81" b907327 MHB76B 3e28472 "MHB76" fe451ab "MHB75" 97d4273 "MHB72B" 991ccde MHB72 542d1d2 "MHB71B" 51c74aa "MHB71" 737dc60 MHB70C 929a4ab DO NOT MERGE - Update security string to 2016-02-01 f16bc41 "MHB70B" f0f73c0 Update Security String to 2016-02-01 6019adf remove Exchange2 from core.mk 031349f "MHB70" 908d0d2 "MHB69B" 0d8ba9d "MHB69" cd118db "MHB68" 912b51b "MHB64" 782d5b4 "MHB63" ce8bb2c "MHB62" 9425a31 "MHB61" d0d9978 "MHB57" a4cdbab "MHB56B" a149cf5 "MHB56" 5806531 Shorten TARGET_BRAND from generic_ to Android e41cd14 "MHB55" cd8553b "MHB54" 170459f Update Security String to 2016-01-01 to mnc-dev 58cdbdc Update Security String to 2016-01-01 - DO NOT MERGE ad74747 "MHB50" bd4a35a "MHB49" 3017459 "MHB48" 792f02c MHB47 55a149b Revert "Change version back to 6.0" 970f203 Change version back to 6.0 ba740ff Switch emulator to generate userdebug images by default 20ed978 Let qemu_props service set system properties in ro.emu and ro.emulator 5b08efb Don't fail build of otatools if there are no device certificates cb31a53 Dist the otatools package. 173219d add otatools-package target 5e70468 Add ld.mc as a requirement for core_tiny.mk as well. 7c4c6f5 sparse_img.py: Divide NONZERO blocks into groups. bc171e3 DO NOT MERGE Revert "D.N.M. Revert "Add the ability to display annotations in the generated docs"" 2d20e3d DO NOT MERGE Revert "Add the ability to display annotations in the generated docs" 610754e Scan all init.*.rc files for flash_recovery service. ========platform/cts between android-6.0.1_r46..android-6.0.1_r54========= CtsCoverage.mk | 43 +- CtsTestCaseList.mk | 7 + apps/CameraITS/tests/scene0/test_metadata.py | 2 - apps/CameraITS/tests/scene1/test_exposure.py | 5 +- apps/CtsVerifier/Android.mk | 30 +- apps/CtsVerifier/AndroidManifest.xml | 84 ++- apps/CtsVerifier/res/layout-land/sensor_test.xml | 2 +- apps/CtsVerifier/res/layout-port/sensor_test.xml | 2 +- apps/CtsVerifier/res/layout-small/sensor_test.xml | 2 +- apps/CtsVerifier/res/layout/ca_boot_notify.xml | 2 +- apps/CtsVerifier/res/layout/car_dock_test_main.xml | 2 +- apps/CtsVerifier/res/layout/fs_main.xml | 2 +- apps/CtsVerifier/res/layout/intent_driven_test.xml | 2 +- apps/CtsVerifier/res/layout/js_charging.xml | 34 +- apps/CtsVerifier/res/layout/js_connectivity.xml | 2 +- apps/CtsVerifier/res/layout/js_idle.xml | 17 +- apps/CtsVerifier/res/layout/list_content.xml | 2 +- apps/CtsVerifier/res/layout/location_mode_main.xml | 2 +- apps/CtsVerifier/res/layout/network_screen_off.xml | 46 ++ apps/CtsVerifier/res/layout/pa_main.xml | 2 +- apps/CtsVerifier/res/layout/pass_fail_list.xml | 2 +- apps/CtsVerifier/res/layout/poa_main.xml | 2 +- apps/CtsVerifier/res/layout/pwa_widgets.xml | 4 +- apps/CtsVerifier/res/layout/vpn_test.xml | 36 ++ apps/CtsVerifier/res/layout/wifi_lockdown.xml | 5 +- apps/CtsVerifier/res/values/attrs.xml | 2 +- apps/CtsVerifier/res/values/strings.xml | 142 ++++- apps/CtsVerifier/res/xml/device_admin.xml | 25 - .../support/wearable/view/BoxInsetLayout.java | 8 +- .../cts/verifier/DialogTestListActivity.java | 6 +- .../com/android/cts/verifier/PassFailButtons.java | 50 +- .../com/android/cts/verifier/TestListActivity.java | 75 +-- .../com/android/cts/verifier/TestListAdapter.java | 6 +- .../cts/verifier/TestResultsBackupHelper.java | 4 +- .../android/cts/verifier/TestResultsProvider.java | 43 +- .../android/cts/verifier/TestResultsReport.java | 1 - .../com/android/cts/verifier/TimerProgressBar.java | 119 ++++ .../src/com/android/cts/verifier/Version.java | 10 +- ...eviceAdminKeyguardDisabledFeaturesActivity.java | 68 +++ .../admin/PolicySerializationTestActivity.java | 7 +- ...tificationKeyguardDisabledFeaturesActivity.java | 48 ++ .../cts/verifier/admin/ScreenLockTestActivity.java | 3 +- .../verifier/audio/AudioFrequencyLineActivity.java | 16 +- .../audio/AudioFrequencySpeakerActivity.java | 9 +- .../android/cts/verifier/audio/Correlation.java | 19 +- .../verifier/deskclock/DeskClockTestsActivity.java | 7 - .../verifier/features/FeatureSummaryActivity.java | 3 + .../ChargingConstraintTestActivity.java | 128 ++++- .../ConnectivityConstraintTestActivity.java | 8 - .../jobscheduler/ConstraintTestActivity.java | 8 +- .../jobscheduler/IdleConstraintTestActivity.java | 119 +++- .../managedprovisioning/ByodFlowTestActivity.java | 69 ++- .../managedprovisioning/ByodHelperActivity.java | 125 +++- .../DeviceAdminTestReceiver.java | 9 +- .../DeviceOwnerNegativeTestActivity.java | 7 - .../DeviceOwnerPositiveTestActivity.java | 12 +- .../managedprovisioning/HandleIntentActivity.java | 21 + .../IntentFiltersTestHelper.java | 2 - .../KeyguardDisabledFeaturesActivity.java | 70 ++- .../managedprovisioning/VpnTestActivity.java | 127 +++++ .../WifiLockdownTestActivity.java | 16 +- .../WorkNotificationTestActivity.java | 69 --- .../net/ConnectivityScreenOffTestActivity.java | 632 +++++++++++++++++++++ .../cts/verifier/p2p/P2pTestListActivity.java | 7 - .../verifier/p2p/RequesterTestListActivity.java | 7 - .../sensors/DeviceSuspendTestActivity.java | 108 ++-- .../streamquality/StreamingVideoActivity.java | 10 +- build/test_host_java_library.mk | 6 + common/device-side/device-info/Android.mk | 3 +- .../common/deviceinfo/GenericDeviceInfo.java | 27 +- .../common/util/WifiConfigCreator.java | 55 +- .../com/android/cts/aadb/TestDeviceFuncTest.java | 3 +- .../cts/appsecurity/ExternalStorageHostTest.java | 4 +- .../WriteExternalStorageTest.java | 8 +- hostsidetests/devicepolicy/Android.mk | 2 + .../AccountManagementTest.java | 67 +++ .../android/cts/deviceowner/KeyManagementTest.java | 2 +- .../WifiConfigCreatorActivity.java | 2 + .../cts/devicepolicy/ManagedProfileTest.java | 6 +- .../src/com/android/cts/monkey/PackageTest.java | 20 +- .../src/android/webkit/cts/WebViewOnUiThread.java | 23 + libs/view/Android.mk | 25 + libs/view/src/com/android/view/Position.java | 108 ++++ .../src/com/android/view/RenderedSurfaceView.java | 105 ++++ .../view/src/com/android/view/SurfaceRenderer.java | 34 ++ tests/camera/Android.mk | 38 ++ tests/camera/AndroidManifest.xml | 81 +++ .../hardware => camera}/res/layout/multi_view.xml | 0 .../res/layout/surface_view.xml | 0 .../res/layout/surface_view_2.xml | 0 .../hardware/camera2/cts/AllocationTest.java | 7 +- .../hardware/camera2/cts/BurstCaptureRawTest.java | 0 .../hardware/camera2/cts/BurstCaptureTest.java | 0 .../camera2/cts/Camera2MultiViewCtsActivity.java | 2 +- .../camera2/cts/Camera2SurfaceViewCtsActivity.java | 2 +- .../hardware/camera2/cts/CameraDeviceTest.java | 0 .../hardware/camera2/cts/CameraManagerTest.java | 0 .../hardware/camera2/cts/CameraTestUtils.java | 0 .../hardware/camera2/cts/CaptureRequestTest.java | 0 .../hardware/camera2/cts/CaptureResultTest.java | 0 .../hardware/camera2/cts/DngCreatorTest.java | 2 + .../cts/ExtendedCameraCharacteristicsTest.java | 0 .../hardware/camera2/cts/FlashlightTest.java | 0 .../hardware/camera2/cts/ImageReaderTest.java | 27 + .../hardware/camera2/cts/ImageWriterTest.java | 0 .../hardware/camera2/cts/MultiViewTest.java | 0 .../hardware/camera2/cts/PerformanceTest.java | 0 .../hardware/camera2/cts/RecordingTest.java | 9 + .../hardware/camera2/cts/ReprocessCaptureTest.java | 0 .../hardware/camera2/cts/RobustnessTest.java | 0 .../camera2/cts/StaticMetadataCollectionTest.java | 2 +- .../hardware/camera2/cts/StaticMetadataTest.java | 0 .../hardware/camera2/cts/StillCaptureTest.java | 19 +- .../camera2/cts/SurfaceViewPreviewTest.java | 0 .../src/android/hardware/camera2/cts/common.rs | 0 .../camera2/cts/crop_yuvf_420_to_yuvx_444.rs | 0 .../camera2/cts/helpers/AssertHelpers.java | 0 .../camera2/cts/helpers/Camera2Focuser.java | 0 .../camera2/cts/helpers/CameraErrorCollector.java | 0 .../camera2/cts/helpers/CameraMetadataGetter.java | 0 .../camera2/cts/helpers/CameraSessionUtils.java | 0 .../hardware/camera2/cts/helpers/InMatcher.java | 0 .../hardware/camera2/cts/helpers/MaybeNull.java | 0 .../camera2/cts/helpers/Preconditions.java | 0 .../camera2/cts/helpers/StaticMetadata.java | 12 - .../camera2/cts/helpers/UncheckedCloseable.java | 0 .../camera2/cts/means_yuvx_444_1d_to_single.rs | 0 .../camera2/cts/means_yuvx_444_2d_to_1d.rs | 0 .../hardware/camera2/cts/rs/AllocationCache.java | 0 .../hardware/camera2/cts/rs/AllocationInfo.java | 0 .../hardware/camera2/cts/rs/BitmapUtils.java | 0 .../camera2/cts/rs/BlockingInputAllocation.java | 0 .../hardware/camera2/cts/rs/RawConverter.java | 0 .../camera2/cts/rs/RenderScriptSingleton.java | 2 +- .../android/hardware/camera2/cts/rs/Script.java | 0 .../hardware/camera2/cts/rs/ScriptGraph.java | 0 .../hardware/camera2/cts/rs/ScriptYuvCrop.java | 0 .../hardware/camera2/cts/rs/ScriptYuvMeans1d.java | 0 .../camera2/cts/rs/ScriptYuvMeans2dTo1d.java | 0 .../hardware/camera2/cts/rs/ScriptYuvToRgb.java | 0 .../hardware/camera2/cts/rs/raw_converter.rs | 0 .../cts/testcases/Camera2AndroidTestCase.java | 0 .../cts/testcases/Camera2MultiViewTestCase.java | 0 .../cts/testcases/Camera2SurfaceViewTestCase.java | 3 +- .../android/hardware/cts/CameraCtsActivity.java | 2 +- .../src/android/hardware/cts/CameraGLTest.java | 9 +- .../src/android/hardware/cts/CameraTest.java | 0 .../hardware/cts/Camera_ParametersTest.java | 0 .../src/android/hardware/cts/Camera_SizeTest.java | 0 .../hardware/cts/GLSurfaceViewCtsActivity.java | 0 .../android/hardware/cts/helpers/CameraUtils.java | 0 .../multiprocess/camera/cts/Camera1Activity.java | 5 +- .../multiprocess/camera/cts/Camera2Activity.java | 3 +- .../camera/cts/CameraEvictionTest.java | 1 - .../camera/cts}/ErrorLoggingService.java | 2 +- .../multiprocess/camera/cts/TestConstants.java | 0 tests/expectations/knownfailures.txt | 27 +- .../usescleartexttraffic-false/AndroidManifest.xml | 4 + .../usescleartexttraffic-true/AndroidManifest.xml | 2 + .../AndroidManifest.xml | 6 +- .../cts/AccessibilityWindowQueryTest.java | 9 + .../app/cts/ActivityManagerMemoryClassTest.java | 4 +- .../tests/app/src/android/app/cts/DialogTest.java | 12 +- .../src/android/app/cts/DownloadManagerTest.java | 20 + .../android/assist/cts/AssistStructureTest.java | 4 + .../src/android/assist/cts/AssistTestBase.java | 3 + .../assist/cts/AssistantContentViewTest.java | 4 + .../src/android/assist/cts/DisableContextTest.java | 4 + .../android/assist/cts/ExtraAssistDataTest.java | 4 + .../src/android/assist/cts/FlagSecureTest.java | 4 + .../src/android/assist/cts/FocusChangeTest.java | 4 + .../android/assist/cts/LargeViewHierarchyTest.java | 6 +- .../src/android/assist/cts/LifecycleTest.java | 4 + .../src/android/assist/cts/ScreenshotTest.java | 12 + .../src/android/assist/cts/TextViewTest.java | 6 +- .../assist/src/android/assist/cts/WebViewTest.java | 6 +- .../android/content/cts/ContextWrapperTest.java | 12 +- tests/tests/graphics/assets/bombfont.ttf | Bin 0 -> 812 bytes tests/tests/graphics/assets/bombfont.ttx | 241 ++++++++ tests/tests/graphics/assets/bombfont2.ttf | Bin 0 -> 812 bytes tests/tests/graphics/assets/bombfont2.ttx | 241 ++++++++ .../src/android/graphics/cts/TypefaceTest.java | 23 + .../hardware/cts/SensorBatchingFifoTest.java | 17 +- .../android/hardware/cts/SensorBatchingTests.java | 107 ++-- .../src/android/hardware/cts/SensorTest.java | 4 +- .../android/hardware/cts/helpers/SensorStats.java | 2 + .../sensoroperations/TestSensorOperation.java | 35 +- .../sensorverification/EventBasicVerification.java | 138 +++++ .../EventBasicVerificationTest.java | 107 ++++ .../sensorverification/EventGapVerification.java | 27 +- .../EventTimestampSynchronizationVerification.java | 9 +- .../sensorverification/FifoLengthVerification.java | 15 +- .../android/keystore/cts/BlockCipherTestBase.java | 9 +- .../src/android/media/cts/AudioRecordTest.java | 33 +- .../src/android/media/cts/AudioTrackTest.java | 20 +- .../media/src/android/media/cts/CodecState.java | 17 +- .../src/android/media/cts/EncodeDecodeTest.java | 83 ++- .../android/media/cts/MediaCodecCencPlayer.java | 4 +- .../media/cts/MediaMetadataRetrieverTest.java | 10 - .../media/src/android/media/cts/MediaSyncTest.java | 12 + .../android/media/cts/NonBlockingAudioTrack.java | 19 +- .../android/media/cts/RemoteControllerTest.java | 163 ++++++ .../mediastress/cts/NativeMediaActivity.java | 5 +- .../standalone/jni/tests/EGLCleanup_test.cpp | 2 +- .../src/android/net/wifi/cts/WifiManagerTest.java | 23 + .../usescleartexttraffic-false/Android.mk | 2 +- .../netsecpolicy/usescleartexttraffic-false/common | 1 + .../usescleartexttraffic-true/Android.mk | 2 +- .../netsecpolicy/usescleartexttraffic-true/common | 1 + .../usescleartexttraffic-unspecified/Android.mk | 2 +- .../usescleartexttraffic-unspecified/common | 1 + tests/tests/os/assets/dex1.bytes | Bin 0 -> 777 bytes tests/tests/os/jni/seccomp-tests/README.android | 4 + .../local-modifications-strict-args-fd88d16.diff | 102 ++++ .../os/jni/seccomp-tests/tests/seccomp_bpf_tests.c | 46 +- .../os/src/android/os/cts/BuildVersionTest.java | 2 +- .../src/android/os/cts/CustomClassLoaderTest.java | 93 +++ .../src/android/os/cts/CustomDexClassLoader.java | 15 +- .../src/android/os/cts/CustomPathClassLoader.java | 27 + .../os/src/android/os/cts/StrictModeTest.java | 18 + tests/tests/os/src/android/os/cts/TestClass.java | 22 + .../permission/cts/FileSystemPermissionTest.java | 4 + .../print/src/android/print/cts/BasePrintTest.java | 7 + tests/tests/security/AndroidManifest.xml | 1 + ...android_security_cts_AudioFlingerBinderTest.cpp | 6 - .../jni/android_security_cts_MediaCryptoTest.cpp | 103 ++++ tests/tests/security/res/raw/bug_25765591.mp2 | Bin 0 -> 65536 bytes tests/tests/security/res/raw/bug_25812590.mp2 | Bin 0 -> 65536 bytes tests/tests/security/res/raw/bug_26366256.midi | Bin 0 -> 565820 bytes tests/tests/security/res/raw/drm_uaf.dm | Bin 0 -> 31898 bytes .../id3v2_3_extended_header_overflow_padding.mp3 | Bin .../src/android/security/cts/HttpPost.java | 100 ++++ .../src/android/security/cts/KeyRequester.java | 202 +++++++ .../src/android/security/cts/KeyRequesterTask.java | 64 +++ .../src/android/security/cts/MediaCryptoTest.java | 124 ++++ .../security/cts/MediaMetadataRetrieverTest.java | 61 ++ .../android/security/cts/MediaServerCrashTest.java | 235 +++++++- .../android/security/cts/ProvisionRequester.java | 91 +++ .../src/android/security/cts/StagefrightTest.java | 156 ++++- .../cts/BaseTelecomTestWithMockServices.java | 25 +- .../telecom/cts/BasicInCallServiceTest.java | 3 +- .../src/android/telecom/cts/OutgoingCallTest.java | 10 +- .../telecom/src/android/telecom/cts/TestUtils.java | 1 + .../src/android/telephony/cts/CellInfoTest.java | 38 +- .../src/android/telephony/cts/SmsMessageTest.java | 16 +- .../cts/SmsUsageMonitorShortCodeTest.java | 2 +- .../src/android/text/cts/StaticLayoutTest.java | 18 + .../cts/PasswordTransformationMethodTest.java | 34 ++ .../method/cts/ScrollingMovementMethodTest.java | 4 +- .../android/media/tv/cts/HardwareSessionTest.java | 13 +- .../app/uiautomation/cts/UiAutomationTest.java | 6 +- .../webkit/src/android/webkit/cts/WebViewTest.java | 4 + .../widget/cts/MockPopupWindowCtsActivity.java | 0 .../src/android/widget/cts/TextViewTest.java | 15 - .../android/cts/apicoverage/CtsApiCoverage.java | 16 +- tools/cts-media/copy_media.sh | 10 +- tools/cts-media/get_achievable_rates.py | 6 + tools/device-setup/TestDeviceSetup/Android.mk | 3 +- .../android/tests/getinfo/DeviceInfoConstants.java | 6 + .../tests/getinfo/DeviceInfoInstrument.java | 39 ++ tools/tradefed-host/res/report/cts_result.xsl | 24 + .../cts/tradefed/build/CtsBuildProvider.java | 2 +- .../cts/tradefed/result/CtsXmlResultReporter.java | 3 + .../cts/tradefed/result/DeviceInfoResult.java | 16 +- .../com/android/cts/tradefed/testtype/GeeTest.java | 2 +- .../tradefed/result/CtsXmlResultReporterTest.java | 14 +- tools/utils/buildCts.py | 35 +- 267 files changed, 5779 insertions(+), 893 deletions(-) ebd79b4 DO NOT MERGE - Add security test for IEffect binder command f4c1ac4 DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp 99b34ec DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls fa86842 CTS test for robust handling of invalid cmap e311e3f DO NOT MERGE: BUMP CTS 5.0 to R4 79a70a6 CTS test for libmedia OOB write anywhere cdee325 Fixed issue with / 3f51455 DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService. 01808e7 add more binder tests for AudioFlinger and AudioPolicyService. e88e845 DO NOT MERGE - Add security test for IEffect binder command 879adeb Test whether mediaserver leaks info across invalid binder calls c2b384c Add CTS tests for IAudioflinger binder checks. 0449073 DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp 1eba384 DO NOT MERGE - Add security test for IEffect binder command 96cdf3c DO NOT MERGE ANYWHERE: Test whether mediaserver leaks info across invalid binder calls 95959a8 DO NOT MERGE - Add CTS tests for IAudioflinger binder checks. 2566392 DO NOT MERGE - add more binder tests for AudioFlinger and AudioPolicyService. 0a93ef4 DO NOT MERGE: rename android_security_cts_AudioflingerBinderTest.cpp to android_security_cts_AudioFlingerBinderTest.cpp 47d7c97 DO NOT MERGE - Add security test for IEffect binder command ab3b26d DO NOT MERGE: Test whether mediaserver leaks info across invalid binder calls 184289f DO NOT MERGE - Add CTS tests for IAudioflinger binder checks. b6e9afd Collect ro.build.reference.fingerprint 558dd2c DO NOT MERGE Collect ro.build.reference.fingerprint f6a9761 Test for mpeg2 decoder bugfix f7ef2dc DO NOT MERGE: Revert "Collect ro.build.reference.fingerprint" 3e92a58 Revert "Collect ro.build.reference.fingerprint" 12813c9 Revert "Collect ro.build.reference.fingerprint" de6a1c5 DO NOT MERGE ANYWHERE Camera: allow more time for AF ca6e524 CTS test for mpeg2 decoder bugfix c84debe Fix layout for WebViewTest#testRequestChildRectangleOnScreen 5788c52 CTS fix: HifiUltrasoundSpeakerTestActivity is available with a speaker cb8b108 Sonivox: add CTS test. 238d2e5 Collect ro.build.reference.fingerprint 51b51aa Test case to check class loading using custom class loader 59d7064 Only reach out to Internet when supported. 12b986f Fix cts api coverage 0d6aa50 Additional CTS test for robust handling of invalid cmap 727fde6 Assert android:usesCleartextTraffic attribute works as expected. ef60be7 Prevent the PopupWindow from overlapping with the status bar e27ff96 DO NOT MERGE CTS host-side preconditions for MNC a895918 DO NOT MERGE relax the iframe interval to 60 349727d DO NOT MERGE relax the iframe interval to 60 3520a1d Fixs bugs regarding CTS fails for low performance codec 8126140 Bug #1111 CTS-Verifier Crash when rotate the DUT. eeb749c Include all CTS apks and jars in the coverage report f7e8eae Revert "Include apks and jars in cts coverage" a8ca2ee Include apks and jars in cts coverage 104a7ff fixed merge issue. ca350cb Creating the Security Test Plan 0130e90 Output XML CTS Coverage report 557f84a CTS: check non-zygote apps are not debuggable DO NOT MERGE 55340f8 Add test for Keystore put overflow 7e7c5dc Add CTS test for DISALLOW_MODIFY_ACCOUNTS 39ebb4b CameraITS: check props before applying linear tonemap ac10f21 Cts test fix for shortcode 48000 bb16331 Disable WiredHeadset tests ff1c623 Fix EDI capturing for platform specific values 5bea9ee Modify strings 12b4680 Move long string test from TextView to StaticLayoutTest 6e53153 Increase delta tolerance in TypefaceTest#testInvalidCmapFont 38b4762 Change minDuration check in Camera2SurfaceView 6fbf791 Fix testExecuteShellCommand test in android.aadb d9865bb DO NOT MERGE ANYWHERE: bumping CTS to 5.1 r5 for security release 86c64ea Modify the y-coordinate of touch events in testTouchEvent bb3c867 Make PassFailButtons inheritable. 57668a8 Let Cts Verifier get authority string at run time. 4018b0b Add a test for IPv6 connectivity when the screen is off fcbf86f Scroll through the spinner of the printer selection 1cc42ff Add the first window under the status bar in addTwoAppPanelWindows d0bdc3c CTS fix: add missing feature flags for API 23 258e25e RECORD_SOUND must be handled by sound recorder app aa887d3 Fix testWifiConfigLockdown failure due to wifi not being ready 2639291 Camera: update FPS range check per spec update 57c15f2 CTS test for robust handling of invalid cmap 6dd5e73 MonkeyTests assertion failures errors. Limit the amount of error data contained in an assertion failue ed4386b Revert "CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures" 7c035f3 TIF: Allow notifyVideoUnavailable in HardwareSessionTest 44c49bc CTS fix: match test to CDD memory requirements 3a15653 DO NOT MERGE: Revert "Camera: cross check camera2 features" 820440b DO NOT MERGE: CameraITS: relax test_blackwhite threshold b0c1112 Revert "MediaMetadataRetrieverTest: add new test to handle overflowed padding." 8327555 MediaMetadataRetrieverTest: remove unused import to fix compile error. 0d059db Update full alarm test requirements 0612101 DO NOT MERGE - MediaServerCrashTest: add testDrmManagerClientReset. a74beb1 MediaServerCrashTest: add testDrmManagerClientReset. 404bbc3 Reduce CTS audio requirements for low memory devices 648ca45 TIF: Allow notifyVideoUnavailable in HardwareSessionTest 3dba1b7 Fix SensorBatchingFifoTest EOB bug aec67ad Do not test AudioPlayback if system doesn't have audio out 96f4d40 Camera: create camera test package bb7fb44 Fix timestamps sort in UiAutomationTest.testWindowContentFrameStats 21a8bd6 Fix for testBadSurfaceDimensions f0f730c Enforce the valid range of psc, pci and lac/cid for primary cells. aba8142 DO NOT MERGE: Revert "Add build number into CTS Verifier." 9fa97c2 Add new keyguard disable features tests for primary profile to CTS Verifier 1e44c21 SensorBatching Test Fixes fc56b9b Add fingerprint feature to cts verifier app b3a7431 Remove cts-verifier tests for two intents. ee509b7 DO NOT MERGE CTS device-side preconditions for MNC 4d93a0e Change an attribute name from layout_box to ctsv_layout_box. 0e31d66 Camera: read exposure value range if possible b1adf9e Make sure the next case started after previous case finished 442a181 Selectively delete files from the sdcard 0ea4882 Increase timeout for gtest runs. 15dbbfa Bump CTS 6.0R3 for Security Releases. dd58e48 Revert "Add build number into CTS Verifier." aaf61c0 Make copy_media.sh POSIX compatible cc728ce CTS: PO tests for DISALLOW_CONFIG_VPN c0ffa1f Media tests should use redirector.gvt1.com 26f8a4d Fixed CtsVerifier version d7cad88 Revert "DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices" 2c43901 Fix for Job Scheduler Charging test case 7712881 Revert "Revert "CTS: Tests for DISALLOW_CONFIG_VPN"" c300031 Revert "CTS: Tests for DISALLOW_CONFIG_VPN" e612a9e Basic test of android.media.RemoteController 92ad9e4 Make AES*CipherTest explicitly use Android Keystore Provider. d3169b6 TIF: Make sure that Cursor.moveToNext() is called before using Cursor 1b43736 Explicitly fail when test file is missing 3e3e4ab removing android.security.cts.ServicePermissionsTest#testDumpProtected from knownfailures a14e074 DO NOT MERGE: Remove DeadObjectException from dumpservice failure condition. f60373a Revert "Camera: mark testFocusDistanceControl known failure" 3c21781 MediaMetadataRetrieverTest: add new test to handle overflowed padding. bd290de disable a bunch of test failures for CTS 6.0R2 45dd49f Camera: mark testFocusDistanceControl known failure 4e485e6 EncodeDecodeTest: use timeout for decoder.dequeueInputBuffer 92eba40 Revert "DO NOT MERGE CTS device-side preconditions for MNC" e989c0c Revert "DO NOT MERGE CTS host-side preconditions for MNC" edf584b Dynamically load the list of runtime permissions. d001dbc Added location tests for BYOD in cts-verfier. 9fb50b6 Fix bugs regarding CTS fails for VP8 codec with low performance e3d326e DO NOT MERGE: Fix testVirtualDisplayRecycles fail for no thread racing protection for mNumTextureUpdated 2840e5c Fixed break #2 971aa2a DO NOT MERGE: Fixed breakage 1296058 DO NOT MERGE: Bumping CTS/CTS Verifier version to CTS 6.0R2. 0efe735 Relieve Sensor Event Gap Test Criterion 40af6fa Don't run Wifi scan timestamp tests when location is turned off. 60b9818 Add a build for CTS Verifier framework library. 52013e1 Fix for Idle Mode Constraint test d8972ff DO NOT MERGE CTS host-side preconditions for MNC b5f74c3 Fix android.os.cts.SeccompTest#testKernelBasicTests under Android Native Bridge. 5b0df2c DO NOT MERGE: fixed breakages b15e4eb DO NOT MERGE: disable android.media.cts.EncodeVirtualDisplayTest#testEncodeVirtualDisplay as it fails on nexus 10 5a5a2bb Add reference url to XML reports c8a9a00 Enable test of events occuring after AudioRecord.stop b8fbd66 Fix testSetPreviewTextureBothCallbacks wait timeout 3cf33b6 Revert "DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage" c891087 media: Add volatile to mThreadStarted to make sure the thread can stop properly. 2ef9c1b DO NOT MERGE: Fix Bitmap and NinePatch drawable tests for non-mdpi devices f8b0e03 DO NOT MERGE: remove duplicate knownfailures 10b5ab9 DO NOT MERGE: fixed build breakage 273af31 DO NOT MERGE: disable camera2 tests a786250 DO NOT MERGE: improve TestVirtualDisplayRecycles to reduce memory usage d774dd4 Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch"" 3bce5d4 Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" 3d6f8bb DO NOT MERGE CTS device-side preconditions for MNC eef7e5a Reduce EGLCleanup test iterations bb1d5a7 Update the build version to 6.0.1. b453110 Camera: remove FREEFORM cropping check for FULL device b068f19 Adjust telecom setup timeout values to be more generous ac4c6d7 Update 320dpi & 360dpi small/normal memory requirements bdfeea4 CTS Verifier fix latency estimation for Loopback test 5863eaf Use FLAG_RECEIVER_FOREGROUND for ordered broadcasts 2cb7235 Revert "DO NOT MERGE ANYWHERE: mark known failure camera tests" 1b64814 media: DecoderTest: make sure we call AudioTrack.stop() e8a13b1 Fix for Frequency Tests to match CDD requirements e5ea9d7 DO NOT MERGE ANYWHERE: mark known failure camera tests 732751c Fix report latency overflow in DeviceSuspendTest dbe0410 camera2: Clean up render script context ad3e7df Skip assist CTS tests on low ram devices dd75b7f DO NOT MERGE Fix CTS failures on AudioFlingerBinderTest for case where remote submix audio HAL is not included test_setMasterMute test_setMasterVolume 3ef522a Fix the issue in testCalculateLength 147c5b1 Remove a cross-profile app linking test. 72ebd2f Runtime hint for android.adminhostside CTS test 3aeb0d3 Enable SPEAKERPHONE CTS tests. 2b51a7c fix failure line handling for VideEncoderDecoderTest. fde5384 CTS: Tests for DISALLOW_CONFIG_VPN 0c4e033 remove TYPE_ORIENTATION sensor requirement. 8ea1911 Fix timeout for testCanInstallValidRsaKeypair in hostsidetests 0b8a4c0 DO NOT MERGE media: add mpeg4 qcif test to VideoDecoderPerfTest. 62b69b9 Refactoring the updatePassButton methods 363df32 Camera: skip unsupported stream combination 2621f72 Fix bugs regarding TextView layout size with large font scale in ScrollingText ffebd97 Dismiss dialogs during indeterminate progress dialog CTS tests 27c55e2 CTS: Add testConnectivityConstraintExecutes_withMobile to knownfailures 7dc91b3 Add FileSystemPermissionTest exception for /dev/dri/renderD129. 3304976 Add FileSystemPermissionTest exception for DRM-based GPU drivers. 4ca5414 CTS: android.text.method.cts related tests failing 21c9cdf Fix for LocationModeHighAccuracyTestActivity test. a1836e3 DO NOT MERGE Add a common lib for generic view util code. 971789b Increased CTS test timeout from 5 sec to 30 sec in ModifyInstallerPackageTest.java bfa14ee Should use getSupportedVideoSizes() 9129f97 collect memory properties in CTS 7542792 Cherrypick the following CLs from LMP MR1 dbf386e Test for issue #16013164: protect app ops setMode(). ========platform/dalvik between android-6.0.1_r46..android-6.0.1_r54========= libdex/OptInvocation.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) c1814ed Fix potential buffer overrun. ========platform/developers/build between android-6.0.1_r46..android-6.0.1_r54========= a7d757c Removing NOTICE files as per b/20081220 ========platform/development between android-6.0.1_r46..android-6.0.1_r54========= apps/Development/Android.mk | 2 +- build/Android.mk | 4 + build/sdk.atree | 16 + samples/Support4Demos/AndroidManifest.xml | 12 +- .../Support4Demos/res/color/tint_state_list.xml | 20 + .../res/drawable-hdpi/ic_favorite.png | Bin 0 -> 875 bytes .../res/drawable-mdpi/ic_favorite.png | Bin 0 -> 551 bytes .../res/drawable-xhdpi/ic_favorite.png | Bin 0 -> 1162 bytes .../res/drawable-xxhdpi/ic_favorite.png | Bin 0 -> 1779 bytes .../res/drawable-xxxhdpi/ic_favorite.png | Bin 0 -> 2295 bytes .../Support4Demos/res/layout/drawable_compat.xml | 51 +++ samples/Support4Demos/res/layout/drawer_layout.xml | 51 --- .../Support4Demos/res/layout/view_pager_layout.xml | 30 ++ samples/Support4Demos/res/values/strings.xml | 16 +- .../supportv4/graphics/DrawableCompatActivity.java | 84 ++++ .../android/supportv4/view/ViewPagerActivity.java | 110 +++++ samples/Support7Demos/AndroidManifest.xml | 29 +- .../res/drawable-hdpi/drawer_shadow.9.png | Bin .../Support7Demos/res/drawable-hdpi/ic_android.png | Bin 0 -> 358 bytes .../res/drawable-mdpi/drawer_shadow.9.png | Bin .../Support7Demos/res/drawable-mdpi/ic_android.png | Bin 0 -> 226 bytes .../res/drawable-xhdpi/drawer_shadow.9.png | Bin .../res/layout/action_bar_drawer_layout.xml | 50 -- .../res/layout/animated_recycler_view.xml | 4 +- samples/Support7Demos/res/layout/drawer_layout.xml | 75 +++ .../res/layout/sample_media_router.xml | 6 + .../Support7Demos/res/layout/selectable_item.xml | 20 +- samples/Support7Demos/res/values/colors.xml | 2 + samples/Support7Demos/res/values/strings.xml | 31 +- samples/Support7Demos/res/values/styles.xml | 43 +- .../supportv7/app/ActionBarWithDrawerLayout.java | 191 -------- .../android/supportv7/media/LocalPlayer.java | 75 +-- .../media/MyMediaRouteControllerDialog.java | 44 ++ .../supportv7/media/OverlayDisplayWindow.java | 7 +- .../example/android/supportv7/media/Player.java | 33 +- .../android/supportv7/media/RemotePlayer.java | 5 +- .../supportv7/media/SampleMediaButtonReceiver.java | 3 - .../supportv7/media/SampleMediaRouteProvider.java | 34 +- .../supportv7/media/SampleMediaRouterActivity.java | 18 +- .../android/supportv7/media/SessionManager.java | 2 + .../supportv7/widget/AnimatedRecyclerView.java | 286 ++++++++++-- .../widget/BaseLayoutManagerActivity.java | 3 +- .../supportv7}/widget/DrawerLayoutActivity.java | 192 +++----- samples/SupportDesignDemos/Android.mk | 1 + samples/SupportDesignDemos/AndroidManifest.xml | 27 ++ samples/SupportDesignDemos/proguard.flags | 7 + .../res/layout/action_layout.xml | 23 + ...r_toolbar_collapse_scroll_with_swiperefresh.xml | 48 ++ ...sign_appbar_toolbar_scroll_tabs_scroll_snap.xml | 49 ++ .../res/layout/design_bottom_sheet.xml | 72 +++ .../SupportDesignDemos/res/layout/design_tabs.xml | 41 -- .../res/layout/design_tabs_viewpager.xml | 13 +- .../res/layout/design_text_input.xml | 40 +- samples/SupportDesignDemos/res/menu/navigation.xml | 6 +- .../res/values-w540dp/dimens.xml | 19 + samples/SupportDesignDemos/res/values/dimens.xml | 19 + samples/SupportDesignDemos/res/values/strings.xml | 6 + ...tToolbarCollapseThenScrollWithSwipeRefresh.java | 27 ++ .../AppBarLayoutToolbarScrollTabsScrollSnap.java | 27 ++ .../support/design/widget/BottomSheetUsage.java | 54 +++ .../support/design/widget/TabLayoutUsage.java | 69 +-- samples/SupportLeanbackDemos/AndroidManifest.xml | 38 ++ samples/SupportLeanbackDemos/generatev4.py | 320 +++++++++++++ samples/SupportLeanbackDemos/res/layout/browse.xml | 5 + .../res/layout/browse_support.xml | 37 ++ .../res/layout/details_support.xml | 25 + .../res/layout/guided_step_activity.xml | 22 + .../res/layout/legacy_details_support.xml | 25 + .../res/layout/playback_controls_support.xml | 36 ++ .../res/layout/rows_support.xml | 38 ++ .../res/layout/search_support.xml | 25 + .../res/layout/vertical_grid_support.xml | 25 + .../SupportLeanbackDemos/res/values/strings.xml | 27 +- samples/SupportLeanbackDemos/res/values/themes.xml | 2 + .../leanback/BrowseErrorSupportActivity.java | 88 ++++ .../example/android/leanback/BrowseFragment.java | 38 +- .../android/leanback/BrowseSupportActivity.java | 40 ++ .../android/leanback/BrowseSupportFragment.java | 162 +++++++ .../example/android/leanback/DetailsActivity.java | 5 +- .../DetailsPresenterSelectionActivity.java | 11 +- .../android/leanback/DetailsSupportActivity.java | 61 +++ .../android/leanback/DetailsSupportFragment.java | 218 +++++++++ .../android/leanback/ErrorSupportFragment.java | 56 +++ .../android/leanback/GuidedStepActivity.java | 283 ++++++++++-- .../leanback/GuidedStepSupportActivity.java | 402 ++++++++++++++++ .../com/example/android/leanback/MainActivity.java | 36 +- .../android/leanback/NewDetailsFragment.java | 3 +- .../leanback/NewDetailsSupportFragment.java | 255 +++++++++++ .../leanback/PlaybackControlSupportHelper.java | 280 ++++++++++++ .../android/leanback/PlaybackOverlayFragment.java | 7 +- .../leanback/PlaybackOverlaySupportActivity.java | 30 ++ .../leanback/PlaybackOverlaySupportFragment.java | 172 +++++++ .../android/leanback/RowsSupportActivity.java | 60 +++ .../android/leanback/RowsSupportFragment.java | 120 +++++ .../leanback/SearchDetailsSupportActivity.java | 23 + .../android/leanback/SearchSupportActivity.java | 67 +++ .../android/leanback/SearchSupportFragment.java | 104 +++++ .../android/leanback/VerticalGridFragment.java | 24 +- .../leanback/VerticalGridSupportActivity.java | 32 ++ .../leanback/VerticalGridSupportFragment.java | 114 +++++ samples/SupportLeanbackShowcase/.gitignore | 7 + .../SupportLeanbackShowcase.iml | 19 + samples/SupportLeanbackShowcase/app/.gitignore | 1 + samples/SupportLeanbackShowcase/app/app.iml | 103 +++++ samples/SupportLeanbackShowcase/app/build.gradle | 36 ++ .../SupportLeanbackShowcase/app/proguard-rules.pro | 17 + .../supportleanbackshowcase/ApplicationTest.java | 13 + .../app/src/main/AndroidManifest.xml | 59 +++ .../supportleanbackshowcase/app/MainActivity.java | 39 ++ .../supportleanbackshowcase/app/MainFragment.java | 181 ++++++++ .../app/cards/CardExampleActivity.java | 34 ++ .../app/cards/CardExampleFragment.java | 132 ++++++ .../app/details/DetailViewExampleActivity.java | 32 ++ .../app/details/DetailViewExampleFragment.java | 179 ++++++++ .../app/details/DetailsDescriptionPresenter.java | 62 +++ .../app/details/ShadowRowPresenterSelector.java | 44 ++ .../app/dialog/DialogExampleActivity.java | 35 ++ .../app/dialog/DialogExampleFragment.java | 67 +++ .../app/grid/GridExampleActivity.java | 30 ++ .../app/grid/GridExampleFragment.java | 72 +++ .../app/media/MediaPlayerGlue.java | 446 ++++++++++++++++++ .../app/media/MusicConsumptionExampleFragment.java | 155 +++++++ .../app/media/MusicExampleActivity.java | 30 ++ .../app/media/SongListRow.java | 20 + .../app/media/TrackListHeader.java | 50 ++ .../app/media/VideoConsumptionExampleFragment.java | 117 +++++ .../app/media/VideoExampleActivity.java | 39 ++ .../app/media/VideoMediaPlayerGlue.java | 57 +++ .../app/media/VideoSurfaceFragment.java | 39 ++ .../app/settings/SettingsExampleActivity.java | 31 ++ .../app/settings/SettingsExampleFragment.java | 107 +++++ .../app/wizard/WizardExample1stStepFragment.java | 70 +++ .../app/wizard/WizardExample2ndStepFragment.java | 101 ++++ .../app/wizard/WizardExample3rdStepFragment.java | 98 ++++ .../app/wizard/WizardExample4thStepFragment.java | 69 +++ .../app/wizard/WizardExampleActivity.java | 47 ++ .../app/wizard/WizardExampleBaseStepFragment.java | 47 ++ .../cards/CharacterCardView.java | 69 +++ .../cards/TextCardView.java | 56 +++ .../cards/presenters/AbstractCardPresenter.java | 79 ++++ .../cards/presenters/CardPresenterSelector.java | 92 ++++ .../cards/presenters/CharacterCardPresenter.java | 40 ++ .../cards/presenters/IconCardPresenter.java | 51 +++ .../cards/presenters/ImageCardViewPresenter.java | 60 +++ .../cards/presenters/SideInfoCardPresenter.java | 74 +++ .../cards/presenters/SingleLineCardPresenter.java | 38 ++ .../cards/presenters/TextCardPresenter.java | 41 ++ .../supportleanbackshowcase/models/Card.java | 129 ++++++ .../supportleanbackshowcase/models/CardRow.java | 44 ++ .../models/DetailedCard.java | 71 +++ .../supportleanbackshowcase/models/Movie.java | 50 ++ .../supportleanbackshowcase/models/Song.java | 116 +++++ .../supportleanbackshowcase/models/SongList.java | 31 ++ .../supportleanbackshowcase/utils/CardListRow.java | 45 ++ .../supportleanbackshowcase/utils/Constants.java | 17 + .../utils/PicassoBackgroundManagerTarget.java | 61 +++ .../utils/ResourceCache.java | 36 ++ .../supportleanbackshowcase/utils/Utils.java | 58 +++ .../drawable-v21/song_row_background_focused.xml | 20 + .../main/res/drawable-xhdpi/background_canyon.jpg | Bin 0 -> 610277 bytes .../main/res/drawable-xhdpi/background_food.jpg | Bin 0 -> 233732 bytes .../src/main/res/drawable-xhdpi/background_sax.jpg | Bin 0 -> 224765 bytes .../res/drawable-xhdpi/card_image_dummy_16_9_l.png | Bin 0 -> 3937 bytes .../res/drawable-xhdpi/card_image_movie_01.png | Bin 0 -> 389440 bytes .../res/drawable-xhdpi/card_image_movie_02.png | Bin 0 -> 286778 bytes .../res/drawable-xhdpi/card_image_movie_03.png | Bin 0 -> 126637 bytes .../res/drawable-xhdpi/card_image_movie_04.png | Bin 0 -> 302881 bytes .../res/drawable-xhdpi/card_image_movie_05.png | Bin 0 -> 303924 bytes .../res/drawable-xhdpi/card_image_movie_06.png | Bin 0 -> 368153 bytes .../res/drawable-xhdpi/card_image_movie_07.png | Bin 0 -> 219069 bytes .../res/drawable-xhdpi/card_image_movie_08.png | Bin 0 -> 269862 bytes .../res/drawable-xhdpi/card_image_movie_09.png | Bin 0 -> 277175 bytes .../res/drawable-xhdpi/card_image_music_01.jpg | Bin 0 -> 173059 bytes .../res/drawable-xhdpi/card_image_music_02.jpg | Bin 0 -> 188294 bytes .../res/drawable-xhdpi/card_image_music_03.jpg | Bin 0 -> 96252 bytes .../res/drawable-xhdpi/card_image_music_04.jpg | Bin 0 -> 84782 bytes .../res/drawable-xhdpi/card_image_music_05.jpg | Bin 0 -> 187373 bytes .../res/drawable-xhdpi/card_image_music_06.jpg | Bin 0 -> 131330 bytes .../res/drawable-xhdpi/card_image_music_07.jpg | Bin 0 -> 120184 bytes .../res/drawable-xhdpi/card_image_music_08.jpg | Bin 0 -> 79576 bytes .../res/drawable-xhdpi/card_image_music_09.jpg | Bin 0 -> 80383 bytes .../res/drawable-xhdpi/card_image_music_10.jpg | Bin 0 -> 129864 bytes .../res/drawable-xhdpi/card_image_music_11.jpg | Bin 0 -> 110962 bytes .../res/drawable-xhdpi/card_image_music_12.jpg | Bin 0 -> 137199 bytes .../res/drawable-xhdpi/card_image_music_13.jpg | Bin 0 -> 84534 bytes .../main/res/drawable-xhdpi/category_action.png | Bin 0 -> 19388 bytes .../main/res/drawable-xhdpi/category_animation.png | Bin 0 -> 20711 bytes .../main/res/drawable-xhdpi/category_classics.png | Bin 0 -> 18841 bytes .../main/res/drawable-xhdpi/category_comedy.png | Bin 0 -> 19503 bytes .../src/main/res/drawable-xhdpi/category_crime.png | Bin 0 -> 19844 bytes .../res/drawable-xhdpi/category_documentary.png | Bin 0 -> 20660 bytes .../src/main/res/drawable-xhdpi/category_drama.png | Bin 0 -> 19306 bytes .../main/res/drawable-xhdpi/coffee_and_tea_01.png | Bin 0 -> 223879 bytes .../main/res/drawable-xhdpi/coffee_and_tea_02.png | Bin 0 -> 330472 bytes .../main/res/drawable-xhdpi/coffee_and_tea_03.png | Bin 0 -> 314348 bytes .../main/res/drawable-xhdpi/coffee_and_tea_04.png | Bin 0 -> 343150 bytes .../main/res/drawable-xhdpi/coffee_and_tea_05.png | Bin 0 -> 288062 bytes .../main/res/drawable-xhdpi/coffee_and_tea_06.png | Bin 0 -> 367936 bytes .../main/res/drawable-xhdpi/coffee_and_tea_07.png | Bin 0 -> 293103 bytes .../main/res/drawable-xhdpi/coffee_and_tea_08.png | Bin 0 -> 339101 bytes .../app/src/main/res/drawable-xhdpi/food_01.png | Bin 0 -> 368998 bytes .../app/src/main/res/drawable-xhdpi/food_02.png | Bin 0 -> 535491 bytes .../app/src/main/res/drawable-xhdpi/food_03.png | Bin 0 -> 526847 bytes .../app/src/main/res/drawable-xhdpi/food_04.png | Bin 0 -> 680355 bytes .../app/src/main/res/drawable-xhdpi/food_05.png | Bin 0 -> 532167 bytes .../app/src/main/res/drawable-xhdpi/food_06.png | Bin 0 -> 521465 bytes .../app/src/main/res/drawable-xhdpi/food_07.png | Bin 0 -> 509352 bytes .../app/src/main/res/drawable-xhdpi/food_08.png | Bin 0 -> 568748 bytes .../app/src/main/res/drawable-xhdpi/food_09.png | Bin 0 -> 344469 bytes .../app/src/main/res/drawable-xhdpi/food_10.png | Bin 0 -> 422496 bytes .../app/src/main/res/drawable-xhdpi/food_11.png | Bin 0 -> 613934 bytes .../app/src/main/res/drawable-xhdpi/food_12.png | Bin 0 -> 390241 bytes .../app/src/main/res/drawable-xhdpi/food_13.png | Bin 0 -> 392126 bytes .../app/src/main/res/drawable-xhdpi/food_14.png | Bin 0 -> 422442 bytes .../main/res/drawable-xhdpi/game_angry_bird_w.png | Bin 0 -> 137211 bytes .../src/main/res/drawable-xhdpi/game_badland_w.png | Bin 0 -> 285313 bytes .../res/drawable-xhdpi/game_leos_fortune_w.png | Bin 0 -> 338385 bytes .../main/res/drawable-xhdpi/game_minion_rush_w.png | Bin 0 -> 230633 bytes .../res/drawable-xhdpi/game_monument_valley_w.png | Bin 0 -> 162442 bytes .../app/src/main/res/drawable-xhdpi/ic_cc.png | Bin 0 -> 1252 bytes .../src/main/res/drawable-xhdpi/ic_installed.png | Bin 0 -> 507 bytes .../main/res/drawable-xhdpi/ic_settings_apps.png | Bin 0 -> 1436 bytes .../main/res/drawable-xhdpi/ic_settings_more.png | Bin 0 -> 629 bytes .../ic_settings_parental_control.png | Bin 0 -> 1453 bytes .../res/drawable-xhdpi/ic_settings_settings.png | Bin 0 -> 1893 bytes .../main/res/drawable-xhdpi/ic_settings_time.png | Bin 0 -> 2317 bytes .../res/drawable-xhdpi/ic_settings_wifi_3_bar.png | Bin 0 -> 1806 bytes .../res/drawable-xhdpi/ic_settings_wifi_4_bar.png | Bin 0 -> 1372 bytes .../src/main/res/drawable-xhdpi/ic_star_off.png | Bin 0 -> 1236 bytes .../main/res/drawable-xhdpi/ic_star_on_yellow.png | Bin 0 -> 1265 bytes .../main/res/drawable-xhdpi/movie_poster_01.png | Bin 0 -> 371243 bytes .../app/src/main/res/drawable-xhdpi/stars_red.png | Bin 0 -> 2053 bytes .../src/main/res/drawable-xhdpi/stars_white.png | Bin 0 -> 2081 bytes .../drawable-xhdpi/thumbnail_example_browse.png | Bin 0 -> 2939 bytes .../res/drawable-xhdpi/thumbnail_example_cards.png | Bin 0 -> 1768 bytes .../drawable-xhdpi/thumbnail_example_custom_01.png | Bin 0 -> 2189 bytes .../drawable-xhdpi/thumbnail_example_detail.png | Bin 0 -> 1603 bytes .../drawable-xhdpi/thumbnail_example_dialog.png | Bin 0 -> 1258 bytes .../res/drawable-xhdpi/thumbnail_example_grid.png | Bin 0 -> 2509 bytes .../thumbnail_example_music_consumption.png | Bin 0 -> 1771 bytes .../drawable-xhdpi/thumbnail_example_settings.png | Bin 0 -> 1367 bytes .../thumbnail_example_video_consumption.png | Bin 0 -> 2326 bytes .../drawable-xhdpi/thumbnail_example_wizard.png | Bin 0 -> 1250 bytes .../main/res/drawable-xhdpi/title_android_tv.png | Bin 0 -> 5641 bytes .../main/res/drawable/app_icon_your_company.png | Bin 0 -> 12416 bytes .../app/src/main/res/drawable/bg_living_room.jpg | Bin 0 -> 136080 bytes .../src/main/res/drawable/bg_living_room_wide.jpg | Bin 0 -> 166393 bytes .../src/main/res/drawable/character_focused.xml | 26 ++ .../main/res/drawable/character_not_focused.xml | 26 ++ .../res/drawable/character_not_focused_padding.xml | 26 ++ .../src/main/res/drawable/default_background.xml | 23 + .../app/src/main/res/drawable/face_01.png | Bin 0 -> 29995 bytes .../app/src/main/res/drawable/face_02.png | Bin 0 -> 32856 bytes .../app/src/main/res/drawable/face_03.png | Bin 0 -> 28412 bytes .../app/src/main/res/drawable/face_04.png | Bin 0 -> 25692 bytes .../app/src/main/res/drawable/face_05.png | Bin 0 -> 15358 bytes .../app/src/main/res/drawable/face_06.png | Bin 0 -> 28374 bytes .../app/src/main/res/drawable/face_07.png | Bin 0 -> 19390 bytes .../app/src/main/res/drawable/face_08.png | Bin 0 -> 26494 bytes .../app/src/main/res/drawable/icon_focused.xml | 23 + .../app/src/main/res/drawable/overlay_black.xml | 19 + .../src/main/res/drawable/song_row_background.xml | 22 + .../res/drawable/song_row_background_focused.xml | 24 + .../res/drawable/wizard_background_blackned.xml | 20 + .../wizard_important_action_item_background.xml | 20 + ...rd_important_action_item_background_focused.xml | 21 + ...mportant_action_item_background_not_focused.xml | 21 + .../src/main/res/layout/activity_cards_example.xml | 26 ++ .../main/res/layout/activity_detail_example.xml | 25 + .../src/main/res/layout/activity_grid_example.xml | 26 ++ .../app/src/main/res/layout/activity_main.xml | 25 + .../src/main/res/layout/activity_music_example.xml | 26 ++ .../main/res/layout/activity_settings_example.xml | 25 + .../src/main/res/layout/activity_video_example.xml | 27 ++ .../app/src/main/res/layout/character_card.xml | 52 +++ .../src/main/res/layout/detail_view_content.xml | 96 ++++ .../app/src/main/res/layout/row_song.xml | 77 ++++ .../src/main/res/layout/row_track_list_header.xml | 44 ++ .../app/src/main/res/layout/side_info_card.xml | 64 +++ .../app/src/main/res/layout/text_icon_card.xml | 79 ++++ .../src/main/res/layout/video_surface_fragment.xml | 20 + .../layout/wizard_progress_action_container.xml | 35 ++ .../res/layout/wizard_progress_action_item.xml | 42 ++ .../app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes .../app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes .../res/mipmap-xhdpi/app_banner_sample_app.png | Bin 0 -> 3492 bytes .../app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../app/src/main/res/raw/cards_example.json | 506 +++++++++++++++++++++ .../app/src/main/res/raw/detail_example.json | 106 +++++ .../app/src/main/res/raw/grid_example.json | 88 ++++ .../app/src/main/res/raw/launcher_cards.json | 63 +++ .../main/res/raw/music_consumption_example.json | 76 ++++ .../app/src/main/res/raw/music_example.json | 106 +++++ .../app/src/main/res/raw/track_01.mp3 | Bin 0 -> 6950210 bytes .../app/src/main/res/raw/track_02.mp3 | Bin 0 -> 8017184 bytes .../app/src/main/res/raw/track_03.mp3 | Bin 0 -> 3320646 bytes .../app/src/main/res/raw/track_04.mp3 | Bin 0 -> 4153235 bytes .../app/src/main/res/raw/track_05.mp3 | Bin 0 -> 4516029 bytes .../app/src/main/res/raw/track_06.mp3 | Bin 0 -> 366592 bytes .../app/src/main/res/raw/track_07.mp3 | Bin 0 -> 6972648 bytes .../app/src/main/res/raw/track_08.mp3 | Bin 0 -> 5779145 bytes .../app/src/main/res/raw/track_09.mp3 | Bin 0 -> 5321271 bytes .../app/src/main/res/raw/wizard_example.json | 6 + .../app/src/main/res/values/arrays.xml | 44 ++ .../app/src/main/res/values/colors.xml | 44 ++ .../app/src/main/res/values/dims.xml | 46 ++ .../app/src/main/res/values/strings.xml | 58 +++ .../app/src/main/res/values/styles.xml | 186 ++++++++ .../app/src/main/res/values/themes.xml | 62 +++ .../app/src/main/res/xml/prefs.xml | 113 +++++ samples/SupportLeanbackShowcase/build.gradle | 20 + samples/SupportLeanbackShowcase/gradle.properties | 18 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 49896 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + samples/SupportLeanbackShowcase/gradlew | 164 +++++++ samples/SupportLeanbackShowcase/gradlew.bat | 90 ++++ samples/SupportLeanbackShowcase/settings.gradle | 1 + sdk/plat_tools_source.prop_template | 2 +- sdk/platform_source.prop_template | 4 +- sdk/support_source.prop_template | 2 +- tools/recovery_l10n/res/values-gu-rIN/strings.xml | 8 - tools/recovery_l10n/res/values-pt-rBR/strings.xml | 8 - tools/recovery_l10n/res/values-sq-rAL/strings.xml | 8 - 324 files changed, 11388 insertions(+), 783 deletions(-) adce814 Update SDK Platform revision for API 23 to 2. [DO NOT MERGE] 372bb98 Update TabLayout demo to use new ViewPager functionality d775d3a SupportLeanbackDemos: guidedstep changes fffb247 Add "select tab" to the tab layout / view pager demo. 8d3349a Add sample activity for ViewPager in Support4Demos 0c356e4 GuidedStepFragment: Example of two columns actions d0b4919 Remove pre-Material drawer demo apps. 220a8ec Material-compliant sample app for drawer layout. caaf7b0 Dont use R.id.content to host GuidedStepFragment 37836fd GuidedStep example: Use standard action IDs and titles d80cfde SupportLeanbackDemo: add example finishGuidedStepFragments() 84d4654 Add a comment on drawer layout file. afeff42 Test app for ViewPager. 193f0c9 Update version to 23.1.1. DO NOT MERGE. 58ccc4a GuidedStep: More example of editing a4404b1 Change LOCAL_MODULE_TAGS from "eng" to "optional" in Dev Tools app. 0fc3f91 Add AppBar sample using SwipeRefreshLayout 88436bd Add demo for TextInputLayout's counter dcd18d5 Update version to 23.1.0. DO NOT MERGE. 00ada54 Update support library to 23.1.1. DO NOT MERGE 6327806 Remove route providers which use RouteGroup 2157e7f SupportLeanbackShowcase: get rid of card view background overdraw 2bd1f62 Support7Demos: Update the MediaRouter demo 0750ff8 SupportLeanbackShowcase: performance fix of ImageCardView resource 7d12018 SupportLeanbackShowcase: dont expand side info c8ad1e5 Leanback Demo: demo of edit title 6fe262d Supportleanbackshowcase: Polishing 2 and transition performance fix ab2a8a7 Supportleanbackshowcase: Polishing 5bf3eba Showcase: Update SDK to 23 and support lib to 23.0.1 2e3684e GuidedStepFragment Subclass need explcitly specify a container id for background c7e4f19 Generate test for PlaybackOverlaySupportFragment 48b4a13 Generate support version of leanback fragment tests d9b5ca8 Add usage of app:actionLayout in NavigationView e088638 Add usage of BottomSheetBehavior 3d1224e RecyclerView in place animations 9e5a6a8 Revert "Revert "Add example of vertical grid transition and GuidedStepFragment"" c1e0465 Revert "Add example of vertical grid transition and GuidedStepFragment" 1585785 Generate example of GuidedStepSupportFragment 7b42f57 Add example of vertical grid transition and GuidedStepFragment 16d9874 Update platform-tools version to 23.0.1 69bd278 Add proguard configuration to support design demos sample app 4e650fb Add snapping scroll example to SupportDesignDemos 063b68e Add DrawableCompat demo to Support4Demos 3dd5d84 Fix typo in SDK generation fab9a1f Add preference and recommendation libs to SDK build 106e334 MediaRouter: Remove uses of not-yet-public API fbe6c81 Pass in current android.jar to api-generator 3fb1da7 MediaRouter: Remove an unused member in SampleMediaRouteProvider b26f52f MediaRouter: Add a sample for the custom route icon e6b7271 Added Transitions and minor code clean up 5d04bdb MediaRouter: Prevent activity from restarting a09fe02 Revert changes of adding guidedstep fragment in Browse cbfd7cd MediaRouter: Add route groups 742e268 WIP: Added transitions to MainFragment. 6a07105 Add editable actions to Guided Step test activity. 26b7df1 Polished Grid example and added a few missing details at Launcher fragment. Video- and Music examples now also use an Activity. BackgroundHandler in MainFragment removed. aeedeb7 Cleaned up strings.xml 63e8181 Removed Browsing example from Showcase app 80116aa Polished Wizard example for Showcase app 9f8ccdc Rearranged classes and removed unused resources. 8dd090f Cleanup and usage of new ImageCardView 63dcb5b Implemented Card-, DetailView-, GridView-, Music- & Video, Wizard-, Dialog examples ========device/huawei/angler between android-6.0.1_r46..android-6.0.1_r54========= AnglerLayout/res/values-af/strings.xml | 8 +- AnglerLayout/res/values-am/strings.xml | 8 +- AnglerLayout/res/values-ar/strings.xml | 8 +- AnglerLayout/res/values-az-rAZ/strings.xml | 23 -- AnglerLayout/res/values-bg/strings.xml | 8 +- AnglerLayout/res/values-bn-rBD/strings.xml | 8 +- AnglerLayout/res/values-ca/strings.xml | 8 +- AnglerLayout/res/values-cs/strings.xml | 8 +- AnglerLayout/res/values-da/strings.xml | 8 +- AnglerLayout/res/values-de/strings.xml | 8 +- AnglerLayout/res/values-el/strings.xml | 8 +- AnglerLayout/res/values-en-rAU/strings.xml | 8 +- AnglerLayout/res/values-en-rGB/strings.xml | 8 +- AnglerLayout/res/values-en-rIN/strings.xml | 8 +- AnglerLayout/res/values-es-rUS/strings.xml | 8 +- AnglerLayout/res/values-es/strings.xml | 8 +- AnglerLayout/res/values-et-rEE/strings.xml | 8 +- AnglerLayout/res/values-eu-rES/strings.xml | 8 +- AnglerLayout/res/values-fa/strings.xml | 8 +- AnglerLayout/res/values-fi/strings.xml | 8 +- AnglerLayout/res/values-fr-rCA/strings.xml | 8 +- AnglerLayout/res/values-fr/strings.xml | 8 +- AnglerLayout/res/values-gl-rES/strings.xml | 8 +- AnglerLayout/res/values-gu-rIN/strings.xml | 8 +- AnglerLayout/res/values-hi/strings.xml | 8 +- AnglerLayout/res/values-hr/strings.xml | 8 +- AnglerLayout/res/values-hu/strings.xml | 8 +- AnglerLayout/res/values-hy-rAM/strings.xml | 8 +- AnglerLayout/res/values-in/strings.xml | 8 +- AnglerLayout/res/values-is-rIS/strings.xml | 8 +- AnglerLayout/res/values-it/strings.xml | 8 +- AnglerLayout/res/values-iw/strings.xml | 8 +- AnglerLayout/res/values-ja/strings.xml | 8 +- AnglerLayout/res/values-ka-rGE/strings.xml | 8 +- AnglerLayout/res/values-kk-rKZ/strings.xml | 8 +- AnglerLayout/res/values-km-rKH/strings.xml | 8 +- AnglerLayout/res/values-kn-rIN/strings.xml | 8 +- AnglerLayout/res/values-ko/strings.xml | 8 +- AnglerLayout/res/values-ky-rKG/strings.xml | 8 +- AnglerLayout/res/values-lo-rLA/strings.xml | 8 +- AnglerLayout/res/values-lt/strings.xml | 8 +- AnglerLayout/res/values-lv/strings.xml | 8 +- AnglerLayout/res/values-mk-rMK/strings.xml | 8 +- AnglerLayout/res/values-ml-rIN/strings.xml | 8 +- AnglerLayout/res/values-mn-rMN/strings.xml | 8 +- AnglerLayout/res/values-mr-rIN/strings.xml | 8 +- AnglerLayout/res/values-ms-rMY/strings.xml | 8 +- AnglerLayout/res/values-my-rMM/strings.xml | 8 +- AnglerLayout/res/values-nb/strings.xml | 8 +- AnglerLayout/res/values-ne-rNP/strings.xml | 8 +- AnglerLayout/res/values-nl/strings.xml | 8 +- AnglerLayout/res/values-pa-rIN/strings.xml | 8 +- AnglerLayout/res/values-pl/strings.xml | 8 +- AnglerLayout/res/values-pt-rBR/strings.xml | 23 -- AnglerLayout/res/values-pt-rPT/strings.xml | 8 +- AnglerLayout/res/values-pt/strings.xml | 8 +- AnglerLayout/res/values-ro/strings.xml | 8 +- AnglerLayout/res/values-ru/strings.xml | 8 +- AnglerLayout/res/values-si-rLK/strings.xml | 8 +- AnglerLayout/res/values-sk/strings.xml | 8 +- AnglerLayout/res/values-sl/strings.xml | 8 +- AnglerLayout/res/values-sq-rAL/strings.xml | 8 +- AnglerLayout/res/values-sr/strings.xml | 8 +- AnglerLayout/res/values-sv/strings.xml | 8 +- AnglerLayout/res/values-sw/strings.xml | 8 +- AnglerLayout/res/values-ta-rIN/strings.xml | 8 +- AnglerLayout/res/values-te-rIN/strings.xml | 8 +- AnglerLayout/res/values-th/strings.xml | 8 +- AnglerLayout/res/values-tl/strings.xml | 8 +- AnglerLayout/res/values-tr/strings.xml | 8 +- AnglerLayout/res/values-uk/strings.xml | 8 +- AnglerLayout/res/values-ur-rPK/strings.xml | 8 +- AnglerLayout/res/values-uz-rUZ/strings.xml | 8 +- AnglerLayout/res/values-vi/strings.xml | 8 +- AnglerLayout/res/values-zh-rCN/strings.xml | 8 +- AnglerLayout/res/values-zh-rHK/strings.xml | 8 +- AnglerLayout/res/values-zh-rTW/strings.xml | 8 +- AnglerLayout/res/values-zu/strings.xml | 8 +- apns-full-conf.xml | 276 ++++++++++++++++++--- device.mk | 2 + init.angler.diag.rc.userdebug | 1 + .../res/res/values-mcc234-mnc30-af/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-am/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ar/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-bg/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-bn-rBD/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ca/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-cs/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-da/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-de/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-el/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-en-rAU/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-en-rGB/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-en-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-es-rUS/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-es/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-et-rEE/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-eu-rES/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-fa/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-fi/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-fr-rCA/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-fr/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-gl-rES/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-gu-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-hi/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-hr/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-hu/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-hy-rAM/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-in/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-is-rIS/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-it/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-iw/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ja/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ka-rGE/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-kk-rKZ/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-km-rKH/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-kn-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ko/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ky-rKG/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-lo-rLA/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-lt/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-lv/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-mk-rMK/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ml-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-mn-rMN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-mr-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ms-rMY/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-my-rMM/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-nb/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ne-rNP/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-nl/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-pa-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-pl/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-pt-rPT/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-pt/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ro/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ru/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-si-rLK/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-sk/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-sl/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-sq-rAL/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-sr/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-sv/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-sw/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ta-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-te-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-th/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-tl/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-tr/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-uk/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-ur-rPK/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-uz-rUZ/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-vi/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-zh-rCN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-zh-rHK/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-zh-rTW/strings.xml | 26 ++ .../res/res/values-mcc234-mnc30-zu/strings.xml | 26 ++ .../core/res/res/values-mcc234-mnc30/strings.xml | 25 ++ .../res/res/values-mcc234-mnc33-af/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-am/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ar/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-bg/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-bn-rBD/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ca/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-cs/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-da/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-de/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-el/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-en-rAU/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-en-rGB/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-en-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-es-rUS/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-es/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-et-rEE/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-eu-rES/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-fa/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-fi/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-fr-rCA/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-fr/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-gl-rES/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-gu-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-hi/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-hr/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-hu/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-hy-rAM/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-in/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-is-rIS/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-it/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-iw/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ja/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ka-rGE/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-kk-rKZ/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-km-rKH/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-kn-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ko/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ky-rKG/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-lo-rLA/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-lt/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-lv/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-mk-rMK/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ml-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-mn-rMN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-mr-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ms-rMY/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-my-rMM/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-nb/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ne-rNP/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-nl/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-pa-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-pl/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-pt-rPT/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-pt/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ro/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ru/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-si-rLK/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-sk/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-sl/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-sq-rAL/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-sr/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-sv/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-sw/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ta-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-te-rIN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-th/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-tl/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-tr/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-uk/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-ur-rPK/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-uz-rUZ/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-vi/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-zh-rCN/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-zh-rHK/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-zh-rTW/strings.xml | 26 ++ .../res/res/values-mcc234-mnc33-zu/strings.xml | 26 ++ .../core/res/res/values-mcc234-mnc33/strings.xml | 25 ++ .../core/res/res/values-mcc311-mnc220/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc221/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc222/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc223/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc224/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc225/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc226/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc227/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc228/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc229/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc580/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc581/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc582/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc583/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc584/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc585/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc586/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc587/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc588/config.xml | 23 ++ .../core/res/res/values-mcc311-mnc589/config.xml | 23 ++ .../core/res/res/values-mcc450-mnc02/config.xml | 4 +- .../core/res/res/values-mcc450-mnc05/config.xml | 2 + .../core/res/res/values-mcc450-mnc06/config.xml | 4 +- .../core/res/res/values-mcc450-mnc08/config.xml | 4 +- .../core/res/res/values-mcc450-mnc11/config.xml | 42 ++++ .../frameworks/base/core/res/res/values/config.xml | 3 + spn-conf.xml | 2 + 262 files changed, 5063 insertions(+), 393 deletions(-) dffee4e Revert "angler: GPS: config LPP_PROFILE=2 as default" afe5b44 angler: apns-full-conf: Modify the apn for Telemach(29370). b3707d6 angler: framework-res: Overlay the WiFi Calling message string for EE. fd2d89a angler: GPS: config LPP_PROFILE=2 as default 0b6172c angler: Messenger: Modify UA for USCC. 8080315 Disable Wifi when emergency call is made [DO NOT MERGE] 3a399f9 angler: enable emergency download mode in userdebug mode cbb930b angler: apns-full-conf: Modify the apn for VIVA(73601). dccc9c4 angler: apns-full-conf: Modify apn for KCT in Korea. c4cf13a angler: Multiple PDP: Modify value of config_auto_attach_data_on_creation eb29d94 angler: Multiple PDP: Modify value of config_auto_attach_data_on_creation 46df4d0 angler: apns-full-conf: Add the ims apns for EE in UK. addc725 angler: apns-full-conf: Change the apns the operators in Bolivia. 154279c angler: add verified boot config 9f13df6 angler: GPS: modify SUPL server config for KCT/KT/LGU 065e093 angler: apns-full-conf: Add the ia type apns for USCC. 66c71aa Remove TMO & MetroPCS for mcc/mnc 310/580 in apn-conf 7e0b742 Revert "Revert "angler: update wifi nvram for Korea"" b5919b4 Revert "angler: update wifi nvram for Korea" 203d3fb Angler: Set boot-dex2oat-threads ========device/lge/bullhead between android-6.0.1_r46..android-6.0.1_r54========= BullheadLayout/res/values-af/strings.xml | 8 +- BullheadLayout/res/values-am/strings.xml | 8 +- BullheadLayout/res/values-ar/strings.xml | 8 +- BullheadLayout/res/values-az-rAZ/strings.xml | 23 - BullheadLayout/res/values-bg/strings.xml | 8 +- BullheadLayout/res/values-bn-rBD/strings.xml | 8 +- BullheadLayout/res/values-ca/strings.xml | 8 +- BullheadLayout/res/values-cs/strings.xml | 8 +- BullheadLayout/res/values-da/strings.xml | 8 +- BullheadLayout/res/values-de/strings.xml | 8 +- BullheadLayout/res/values-el/strings.xml | 8 +- BullheadLayout/res/values-en-rAU/strings.xml | 8 +- BullheadLayout/res/values-en-rGB/strings.xml | 8 +- BullheadLayout/res/values-en-rIN/strings.xml | 8 +- BullheadLayout/res/values-es-rUS/strings.xml | 8 +- BullheadLayout/res/values-es/strings.xml | 8 +- BullheadLayout/res/values-et-rEE/strings.xml | 8 +- BullheadLayout/res/values-eu-rES/strings.xml | 8 +- BullheadLayout/res/values-fa/strings.xml | 8 +- BullheadLayout/res/values-fi/strings.xml | 8 +- BullheadLayout/res/values-fr-rCA/strings.xml | 8 +- BullheadLayout/res/values-fr/strings.xml | 8 +- BullheadLayout/res/values-gl-rES/strings.xml | 8 +- BullheadLayout/res/values-gu-rIN/strings.xml | 8 +- BullheadLayout/res/values-hi/strings.xml | 8 +- BullheadLayout/res/values-hr/strings.xml | 8 +- BullheadLayout/res/values-hu/strings.xml | 8 +- BullheadLayout/res/values-hy-rAM/strings.xml | 8 +- BullheadLayout/res/values-in/strings.xml | 8 +- BullheadLayout/res/values-is-rIS/strings.xml | 8 +- BullheadLayout/res/values-it/strings.xml | 8 +- BullheadLayout/res/values-iw/strings.xml | 8 +- BullheadLayout/res/values-ja/strings.xml | 8 +- BullheadLayout/res/values-ka-rGE/strings.xml | 8 +- BullheadLayout/res/values-kk-rKZ/strings.xml | 8 +- BullheadLayout/res/values-km-rKH/strings.xml | 8 +- BullheadLayout/res/values-kn-rIN/strings.xml | 8 +- BullheadLayout/res/values-ko/strings.xml | 8 +- BullheadLayout/res/values-ky-rKG/strings.xml | 8 +- BullheadLayout/res/values-lo-rLA/strings.xml | 8 +- BullheadLayout/res/values-lt/strings.xml | 8 +- BullheadLayout/res/values-lv/strings.xml | 8 +- BullheadLayout/res/values-mk-rMK/strings.xml | 8 +- BullheadLayout/res/values-ml-rIN/strings.xml | 8 +- BullheadLayout/res/values-mn-rMN/strings.xml | 8 +- BullheadLayout/res/values-mr-rIN/strings.xml | 8 +- BullheadLayout/res/values-ms-rMY/strings.xml | 8 +- BullheadLayout/res/values-my-rMM/strings.xml | 8 +- BullheadLayout/res/values-nb/strings.xml | 8 +- BullheadLayout/res/values-ne-rNP/strings.xml | 8 +- BullheadLayout/res/values-nl/strings.xml | 8 +- BullheadLayout/res/values-pa-rIN/strings.xml | 8 +- BullheadLayout/res/values-pl/strings.xml | 8 +- BullheadLayout/res/values-pt-rBR/strings.xml | 23 - BullheadLayout/res/values-pt-rPT/strings.xml | 8 +- BullheadLayout/res/values-pt/strings.xml | 8 +- BullheadLayout/res/values-ro/strings.xml | 8 +- BullheadLayout/res/values-ru/strings.xml | 8 +- BullheadLayout/res/values-si-rLK/strings.xml | 8 +- BullheadLayout/res/values-sk/strings.xml | 8 +- BullheadLayout/res/values-sl/strings.xml | 8 +- BullheadLayout/res/values-sq-rAL/strings.xml | 8 +- BullheadLayout/res/values-sr/strings.xml | 8 +- BullheadLayout/res/values-sv/strings.xml | 8 +- BullheadLayout/res/values-sw/strings.xml | 8 +- BullheadLayout/res/values-ta-rIN/strings.xml | 8 +- BullheadLayout/res/values-te-rIN/strings.xml | 8 +- BullheadLayout/res/values-th/strings.xml | 8 +- BullheadLayout/res/values-tl/strings.xml | 8 +- BullheadLayout/res/values-tr/strings.xml | 8 +- BullheadLayout/res/values-uk/strings.xml | 8 +- BullheadLayout/res/values-ur-rPK/strings.xml | 8 +- BullheadLayout/res/values-uz-rUZ/strings.xml | 8 +- BullheadLayout/res/values-vi/strings.xml | 8 +- BullheadLayout/res/values-zh-rCN/strings.xml | 8 +- BullheadLayout/res/values-zh-rHK/strings.xml | 8 +- BullheadLayout/res/values-zh-rTW/strings.xml | 8 +- BullheadLayout/res/values-zu/strings.xml | 8 +- apns-full-conf.xml | 75 +-- audio_platform_info.xml | 1 + device.mk | 10 +- dumpstate/dumpstate.c | 1 + init.bullhead.misc.rc.user | 4 + init.bullhead.misc.rc.userdebug | 4 + init.bullhead.rc | 5 + kernel-headers/linux/fuse.h | 577 ++++++++++++++++ media_codecs_performance.xml | 8 +- original-kernel-headers/linux/fuse.h | 739 +++++++++++++++++++++ .../core/res/res/values-mcc234-mnc30/strings.xml | 25 + .../core/res/res/values-mcc234-mnc33/strings.xml | 25 + .../core/res/res/values-mcc302-mnc220/config.xml | 17 + .../core/res/res/values-mcc405-mnc840/strings.xml | 25 + .../core/res/res/values-mcc405-mnc855/strings.xml | 25 + .../core/res/res/values-mcc405-mnc856/strings.xml | 25 + .../core/res/res/values-mcc405-mnc857/strings.xml | 25 + .../core/res/res/values-mcc405-mnc858/strings.xml | 25 + .../core/res/res/values-mcc405-mnc859/strings.xml | 25 + .../core/res/res/values-mcc405-mnc860/strings.xml | 25 + .../core/res/res/values-mcc405-mnc861/strings.xml | 25 + .../core/res/res/values-mcc405-mnc862/strings.xml | 25 + .../core/res/res/values-mcc405-mnc863/strings.xml | 25 + .../core/res/res/values-mcc405-mnc864/strings.xml | 25 + .../core/res/res/values-mcc405-mnc865/strings.xml | 25 + .../core/res/res/values-mcc405-mnc866/strings.xml | 25 + .../core/res/res/values-mcc405-mnc867/strings.xml | 25 + .../core/res/res/values-mcc405-mnc868/strings.xml | 25 + .../core/res/res/values-mcc405-mnc869/strings.xml | 25 + .../core/res/res/values-mcc405-mnc870/strings.xml | 25 + .../core/res/res/values-mcc405-mnc871/strings.xml | 25 + .../core/res/res/values-mcc405-mnc872/strings.xml | 25 + .../core/res/res/values-mcc405-mnc873/strings.xml | 25 + .../core/res/res/values-mcc405-mnc874/strings.xml | 25 + .../frameworks/base/core/res/res/values/config.xml | 3 + .../packages/apps/Settings/res/values/config.xml | 25 + sepolicy/file.te | 1 + sepolicy/file_contexts | 1 + sepolicy/surfaceflinger.te | 1 + spn-conf.xml | 2 + 118 files changed, 2297 insertions(+), 406 deletions(-) bea2e9d Correct encoder peformance expected values e6cc7b7 Revert "bullhead: Change default LPP_PROFILE value" 347655a bullhead: Change default LPP_PROFILE value e063b46 bullhead/apns: Update apns-full-conf.xml 9923ffe bullhead/audio: update audio_platform_info for voice lineout 1b072d6 Enable color temperature developer setting 9b31753 Disable Wifi when emergency call is made [DO NOT MERGE] ff1cce4 [DO NOT MERGE] kernel-headers: add device specific fuse.h 1062f16 Set wfcSpnFormat for Reliance WFC 305f98e bullhead/apns: Update apns-full-conf.xml fee6ec7 bullhead/reboot: use hardresets for user builds 940a03e Revert "Revert "bullhead/gps: Add TELUS SUPL overlay"" c1f87d4 bullhead: add verified_boot config 59560b4 bullhead/apns: Add ims apn for EE WFC 73a62b4 Add spnOverride entries for EE WFC 0f2d31e Set wfcSpnFormat for EE WFC c2a0db9 Dump /d/dma_buf/bufinfo in bugreports. c9dd6a0 Remove TMO & MetroPCS entries for mcc/mnc 310/580 in apn-conf 6372cfa Bullhead: Set boot-dex2oat-threads ========device/lge/hammerhead between android-6.0.1_r46..android-6.0.1_r54========= apns-full-conf.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 93023eb Remove TMO & MetroPCS entries for mcc/mnc 310/580 in apn-conf ========device/sample between android-6.0.1_r46..android-6.0.1_r54========= etc/apns-full-conf.xml | 9 --------- 1 file changed, 9 deletions(-) efaef57 Remove TMO & MetroPCS entries for mcc/mnc 310/580 in apn-conf ========platform/external/aac between android-6.0.1_r46..android-6.0.1_r54========= f51dec1 Fix aacDecoder_drcExtractAndMap() f1f22e4 Fix stack corruption happening in aacDecoder_drcExtractAndMap() 2d435aa Remove __DATE__/__TIME__ ========platform/external/boringssl between android-6.0.1_r46..android-6.0.1_r54========= src/crypto/asn1/a_int.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) a1d5965 Fix encoding bug in i2c_ASN1_INTEGER 4556258 Remove support for mis-encoded PKCS#8 DSA keys. b58f8d1 DO NOT MERGE ANYWHERE Revert "Whitelist windows modules" 184bc93 BoringSSL: always build with symbol visibility flags. b849459 Revert "Revert "external/boringssl: sync with upstream."" a04d78d Revert "external/boringssl: sync with upstream." 1e4884f external/boringssl: sync with upstream. 08656b6 Whitelist windows modules e25abed Fix and re-enable clang build. 13204c3 Disable clang build temporarily to fix build. 71a0705 Add a build target to build bssl for host. bd9957e Handle RDRAND failures. e0846be dsa_pub_encode: Write out DSA parameters (p, q, g) in addition to key. 98856d4 Fix for CVE-2015-1789. 56d2503 Fixes for CVE-2015-1791. 0e6bb1c Add ECDHE-PSK-AES{128,256}-SHA cipher suites. a4be71c Drop ECDHE-PSK-AES-128-GCM. cfb958c Fix Windows SDK build again f4e4272 Bump revision of BoringSSL. 0d4deb2 Disable 0xcafe cipher suite (PSK with AES-GCM). 86426f7 s/-Wno-unused-parameters/-Wno-unused-parameter/ 12addf8 external/boringssl: fix |SSLeay|. 71cbcbe external/boringssl: add -Wno-unused-parameters. 190eb16 external/boringssl: fix use after free in X509. 3ca955a Copy ecdsa_meth in EC_KEY_copy. f5cea4e Add |BIO_read_asn1| to read a single ASN.1 object. 5a0d510 Copy ecdsa_meth in EC_KEY_copy. dfce004 Add rules.mk for building Trusty. a070e05 external/boringssl: disable ChaCha20-Poly1305 cipher suites. 9eb412c external/boringssl: update #define guards for x86_64-gcc.c. 9385cb1 MinGW on Linux uses lowercase include files, part 2 ========platform/external/bouncycastle between android-6.0.1_r46..android-6.0.1_r54========= 288f88f GCMParameters: fix insecure tag size a657c1d DO NOT MERGE bouncycastle: limit input length as specified by the NIST spec ========platform/external/conscrypt between android-6.0.1_r46..android-6.0.1_r54========= 014a3fd Fix updateAAD when offset is not 0 c6fb365 OpenSSLCipher: multiple calls to updateAAD were ignored 550bba7 OpenSSLCipher: reset AAD when necessary 4c9f9c2 Prevent duplicate certificates in TrustedCertificateIndex c4ab1b9 Cache intermediate CA separately c061be0 Remove OpenSSLEngine.getSecretKeyById. 59c1304 Remove references to OpenSSL's |wbuf|. ec8f7ef Switch OpenSSLMac from EVP_PKEY_HMAC to HMAC_CTX. 08fdfb4 Prepare for BoringSSL update. f95bf50 Move BlockGuard and CloseGuard to Platform 126ec77 Move BlockGuard and CloseGuard to Platform 9a648e9 ct: Add code to verify timestamps for certificates. 05f3b16 ct: Add basic data structures and serialization routines. 7b3add1 Prepare the GmsCore target for BoringSSL 13e50a1 Move CloseGuard and BlockGuard to stubs 2e93943 Move CloseGuard and BlockGuard to stubs 5e3abd2 NativeCrypto: Add TLS SCT extension support. 32f3453 NativeCrypto: support OCSP stapling f45afe9 NativeCrypto: add method to extract extensions from an OCSP response. 8acb72c Fix typo in previous checkin 9c2fa52 Allow compilation with other build systems da47304 Do not waste entropy when using BoringSSL e5b2ed0 Restore compatibility with OpenSSL 64c8565 Add method to delete extension from a certificate eced839 Remove references to OpenSSL's |wbuf|. bb70f6a Add methods to parse keys from PEM input. f417aca Prepare for BoringSSL update. dbdd143 GCM: set default tag size to 12 bytes 363ec65 GCM: return the correct AlgorithmParameters ed628f9 external/conscrypt: allow server-initiated renegotiations. 6e2618d OpenSSLX509Certificate: use OID if alg name unavailable a958f45 Update conscrypt build.gradle for the native generator 134dc92 external/conscrypt: control binary-field EC with OPENSSL_NO_EC2M. 5429f72 Update NativeCryptoTest 089b401 Adjust Signature interface for BoringSSL 97e54bd external/conscrypt: remove assertion SSL_OP_NO_SSLv2 is set 086dd64 Update CryptoUpcalls documentation c63e8fa Documentation fixes d47aa92 OpenSSLCipher: remove unused variable c0010ca conscrypt: change test of SSL_set_cipher_lists e981ca9 Use the *_up_ref functions always a001421 Switch OpenSSLMac from EVP_PKEY_HMAC to HMAC_CTX. 922aa71 Remove OpenSSLEngine.getSecretKeyById. c05697c Use SSL_CTX_set_tmp_ecdh instead of SSL_CTX_set_tmp_ecdh_callback. 3b510c7 Consistently use ARRAY_OFFSET_*INVALID macros. d9a48aa Fix compilation with OpenSSL 79f05f4 Fix error conditions in certificate/PKCS#7 reading c590a93 Try to get preferred external provider edc4f27 Fix up JNI_TRACE for AEAD 279e984 Fix RSA upcalls from TLS/SSL into JCA. 61c66eb Fix ECDSA upcalls from TLS/SSL into JCA. 5b6a5ec NativeCrypto: special case for empty cipher list a8a4643 Add clang-format file to approximate existing style 8fa4acd OpenSSLCipher: adjust expected length with padding in decrypt mode d7dbb00 Revert "OpenSSLCipher: adjust expected length with padding in decrypt mode" ba3f063 external/conscrypt: tweaks for next BoringSSL import. eb3a7e3 OpenSSLCipher: adjust expected length with padding in decrypt mode 4985487 NativeCrypto: return of 0 is error for EVP_Sign/VerifyFinal ed396e9 OpenSSLKey: unsupported algorithm is an InvalidKeyException 6a1e707 NativeCrypto: throw exception on RSA op failure 0f84dc6 Use |BIO_read_asn1| when parsing PKCS#7. 66537ee Add isFinite flag to OpenSSLBIOInputStream. d8606d5 SSL: select the right key type for kx 3e1a686 EVP_AEAD: change constant to work with non-BoringSSL 1a86c54 Stop printing out private key parameters, part 2 2b3a4bd Throw InvalidKeyException from ECDH_compute_key 7c5b76c Stop printing out private key parameters f5b4518 Move BoringSSL indication to NativeConstants a5cf81a external/conscrypt: don't define equals for OpenSSLECGroupContext and OpenSSLECPointContext. cac9de8 Fix fast path for OpenSSLECPublicKey ========platform/external/deqp between android-6.0.1_r46..android-6.0.1_r54========= android/cts/master/com.drawelements.deqp.gles2.xml | 51 - android/cts/master/com.drawelements.deqp.gles3.xml | 1115 -------------------- .../cts/master/com.drawelements.deqp.gles31.xml | 282 +---- android/cts/master/gles2-master.txt | 17 - .../cts/master/gles3-565-no-depth-no-stencil.txt | 1115 -------------------- android/cts/master/gles31-master.txt | 42 +- android/cts/master/gles31-multisample.txt | 36 - android/cts/master/gles31-rotate-landscape.txt | 36 - android/cts/master/gles31-rotate-portrait.txt | 36 - .../cts/master/gles31-rotate-reverse-landscape.txt | 36 - .../cts/master/gles31-rotate-reverse-portrait.txt | 36 - android/cts/master/src/gles2-test-issues.txt | 23 + .../cts/master/src/gles3-pixelformat-issues.txt | 14 +- android/cts/master/src/gles31-hw-issues.txt | 7 +- modules/gles2/functional/es2fFboRenderTest.cpp | 2 +- modules/gles3/functional/es3fMultisampleTests.cpp | 14 +- 16 files changed, 52 insertions(+), 2810 deletions(-) 3f450ec Increase GLES2 fbo comparison threshold to 0.03 3f71117 Remove few tests affected by a HW limitation 6b37e7d DO NOT MERGE: Restore accidentally reverted mustpass .txt changes 85fcb8d Remove GLES2-texture.wrap tests from mustpass b84fd4b Remove GLES2.functional.texture.units.2_units.only_cube.9 from mustpass d8e85a9 DO NOT MERGE Refresh GLES 3.1 must-pass XML ee0868c Remove wide line bounding box cases 0fb14e8 DO NOT MERGE Remove MSAA wide line derivate tests 9a42bb8 Remove GLES2.functional.dither.disable.gradient.* tests from mustpass 75da7d2 DO NOT MERGE add running time hints for dEQP packages 494bb5a Exclude RGB565 blending cases from the must-pass 57f1d6d Change MSAA sample-count error to warning e625e2d DO NOT MERGE Restore accidentally commented line e3f31fb DO NOT MERGE Split GLES31 copy image tests in 3. e98edf6 DO NOT MERGE: Add cube gather tests that avoid corners; remove D32F from mustpass 91be034 Remove broken record_variable_selection test from MR1 must-pass. a77161b DO NOT MERGE: Apply fix for tessellation fractional even test verification. 5b076d9 DO NOT MERGE Do not require signed zero support in ldexp tests() 5c7feb8 DO NOT MERGE: Ignore denormals in floatUlpThresholdCompare. ========platform/external/dhcpcd between android-6.0.1_r46..android-6.0.1_r54========= 70f592d Improve length checks in DHCP Options parsing of dhcpcd. ========platform/external/doclava between android-6.0.1_r46..android-6.0.1_r54========= src/com/google/doclava/Doclava.java | 6 ++++++ src/com/google/doclava/MemberInfo.java | 8 +++++--- src/com/google/doclava/Stubs.java | 8 +++++++- 3 files changed, 18 insertions(+), 4 deletions(-) 77cd5e5 Properly expose methods that override a non-hidden method in a hidden superclass in the API files. 7d88743 Add a flag to control the annotated field visibility exception 7252230 DO NOT MERGE Revert "D.N.M. Revert "Display annotations and annotation values when they are requested"" 846e468 DO NOT MERGE Revert "Display annotations and annotation values when they are requested" ========platform/external/drm_hwcomposer between android-6.0.1_r46..android-6.0.1_r54========= Android.mk | 13 +- autofd.h | 101 ++++++++++ autolock.cpp | 56 ++++++ autolock.h | 42 ++++ drmcomposition.cpp | 26 +-- drmcomposition.h | 2 +- drmcompositor.cpp | 28 +-- drmcompositor.h | 2 +- drmcompositorworker.cpp | 28 ++- drmcompositorworker.h | 1 + drmconnector.cpp | 26 +-- drmconnector.h | 18 +- drmcrtc.cpp | 3 - drmcrtc.h | 5 +- drmdisplaycomposition.cpp | 144 +++++++++---- drmdisplaycomposition.h | 9 +- drmdisplaycompositor.cpp | 333 +++++++++++++++++++++++-------- drmdisplaycompositor.h | 25 ++- drmencoder.cpp | 11 - drmencoder.h | 12 +- drm_hwcomposer.h => drmhwcomposer.h | 97 ++------- drmmode.cpp | 22 -- drmmode.h | 33 ++- drmplane.cpp | 3 - drmplane.h | 5 +- drmproperty.cpp | 11 - drmproperty.h | 15 +- drmresources.cpp | 189 ++++++------------ drmresources.h | 31 +-- glworker.cpp | 50 ++--- hwcomposer.cpp | 187 +++++++++-------- importer.h | 2 +- seperate_rects.cpp => separate_rects.cpp | 30 ++- seperate_rects.h => separate_rects.h | 14 +- virtualcompositorworker.cpp | 8 +- virtualcompositorworker.h | 2 +- worker.cpp | 26 ++- worker.h | 9 +- 38 files changed, 950 insertions(+), 669 deletions(-) e3141c6 drm_hwcomposer: Always call PrepareFrame() for compositions 6c18b3b drm_hwcomposer: Save the atomic_test result between tests 6afbb6a drm_hwcomposer: only check the composition after a geometry change b100837 drm_hwcomposer: Skip layers which aren't on-screen 0c7da1e drm_hwcomposer: set blending mode to kPreMult for GL output 04b47ea drm_hwcomposer: Allow for multiple transforms at once 647beb2 drm_hwcomposer: Check the composition before sending to frame worker d51c761 drm_hwcomposer: Split DrmDisplayCompositor::SquashAll() c07b211 drm_hwcomposer: Add test_only mode to CommitFrame 35301f4 drm_hwcomposer: Create mode blob on modeset queue 2b4b1ee drm_hwcomposer: during SquashAll, skip layers with kSourceNone bff33ac drm_hwcomposer: composite down to a primary plane after a timeout faca209 drm_hwcomposer: Increase the virtual display compositor's fence timeout cb1cfc8 drm_hwcomposer: avoid creating release fences for invalid OutputFd 49446bc drm_hwcomposer: add AutoLock to automatically handle pthread_mutex_lock 8467b12 drm_hwcomposer: add optional timeout for WaitForSignalOrExitLocked db81fce drm_hwcomposer: always put protected layers on hardware planes aa2f4a5 drm_hwcomposer: fix spelling of "separate". f3d3603 drm_hwcomposer: filter out empty or invalid rects. bd61c8d drm_hwcomposer: Handle HWC_SKIP_LAYER properly 3979f7d drm_hwcomposer: add ATRACE_CALL. 7642c92 drm_hwcomposer: update #include's for drm_hwcomposer.h d8c19a0 drm_hwcomposer: rename file with underscore to not use underscore ff30b52 drm_hwcomposer: polish for old DRM wrapper code ========platform/external/flac between android-6.0.1_r46..android-6.0.1_r54========= 284969d Avoid free-before-initialize vulnerability in heap ========platform/external/hamcrest between android-6.0.1_r46..android-6.0.1_r54========= 3e8fd45 Revert "Add a configuration to hamcrest-library build.gradle" 87e430c Add a configuration to hamcrest-library build.gradle ========platform/external/icu between android-6.0.1_r46..android-6.0.1_r54========= icu4c/source/data/misc/metaZones.txt | 22 +---- icu4c/source/data/misc/windowsZones.txt | 27 +++--- icu4c/source/data/misc/zoneinfo64.txt | 91 +++++++++++---------- icu4c/source/stubdata/icudt55l.dat | Bin 23068528 -> 23068784 bytes icu4c/source/test/intltest/tztest.cpp | 3 +- icu4j/main/shared/data/icudata.jar | Bin 10164162 -> 10164162 bytes icu4j/main/shared/data/icutzdata.jar | Bin 90479 -> 90477 bytes .../ibm/icu/dev/test/timezone/TimeZoneTest.java | 3 +- 8 files changed, 63 insertions(+), 83 deletions(-) df0d763 Cherrypick http://bugs.icu-project.org/trac/changeset/37162. DO NOT MERGE ========platform/external/jetty between android-6.0.1_r46..android-6.0.1_r54========= AndroidManifest.xml | 16 ++++++++++++++++ README.android | 28 +++++++++++++++------------- build.gradle | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 13 deletions(-) 7bed928 Add files necessary for building with gradle to external/jetty. ========platform/external/libavc between android-6.0.1_r46..android-6.0.1_r54========= decoder/ih264d_api.c | 46 +++++++++++++++++++++++++++++++++++++++ decoder/ih264d_dpb_mgr.c | 10 +++++++++ decoder/ih264d_parse_bslice.c | 9 +++++++- decoder/ih264d_parse_islice.c | 10 +++++++-- decoder/ih264d_parse_pslice.c | 18 +++++++++++++-- decoder/ih264d_parse_slice.c | 3 +-- decoder/ih264d_process_intra_mb.c | 2 ++ 7 files changed, 91 insertions(+), 7 deletions(-) 90bda5f Fix slice params for interlaced video 12cad5c Decoder: Set u1_long_term_reference_flag to 0 for error concealment e30c766 Decoder: Initialize slice parameters before concealing error MBs 0df39f6 Decoder: Memset few structures to zero to handle error clips 892515d Decoder: Fix for handling invalid intra mode c57fc37 Decoder: Fix stack underflow in CAVLC 4x4 parse functions 50a580a Ensure ih264d_start_of_pic() is not repeated in ih264d_mark_err_slice_skip() 943323f Return error when there are more mmco params than allocated size 4a524d3 Decoder Update mb count after mb map is set. 1c01bc1 Remove __DATE__/__TIME__ from Android builds ========platform/external/libhevc between android-6.0.1_r46..android-6.0.1_r54========= 2060081 DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips b9f7c2c DO NOT MERGE Added few memsets to avoid uninitialized reads for error clips 552578a Revert "Added few memsets to avoid uninitialized reads for error clips" 6ae135c Remove __DATE__/__TIME__ from Android builds dca46f9 Added few memsets to avoid uninitialized reads for error clips d71abc6 Added few memsets to avoid uninitialized reads for error clips e8bfec1 Aligned ps_pic_pu to 4 bytes ========platform/external/libmpeg2 between android-6.0.1_r46..android-6.0.1_r54========= decoder/impeg2d_bitstream.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 560a30c Fixed out of bound read in flush_bits 58a6822 Return error for wrong mb_type ba604d3 Fix for handling streams which resulted in negative num_mbs_left 8b4ed5a Fixed stack buffer overflow ffab15e Fixed bit stream access to make sure that it is not read beyond the allocated size. ae6d9f7 Remove __DATE__/__TIME__ from Android builds ========platform/external/libnfc-nci between android-6.0.1_r46..android-6.0.1_r54========= halimpl/bcm2079x/hal/hal/nfc_hal_dm.c | 112 ++++++++++++++++++++++++++++++++ halimpl/bcm2079x/hal/hal/nfc_hal_main.c | 58 ++++++++++++++--- halimpl/bcm2079x/hal/hal/nfc_hal_nci.c | 12 ++++ src/hal/int/nfc_brcm_defs.h | 1 + src/hal/int/nfc_hal_int.h | 10 +++ 5 files changed, 185 insertions(+), 8 deletions(-) 633b73f Don't free memory that shouldn't be freed. 920423e Fix 256-bit Thinfilm NFC barcode. bc2e8f4 Set power level to 0 when stack shuts down ========platform/external/libpng between android-6.0.1_r46..android-6.0.1_r54========= bbe98b4 Update libpng to 1.6.20 ========platform/external/libvpx between android-6.0.1_r46..android-6.0.1_r54========= 41607d2 Fix ParseElementHeader to support 0 payload elements ========platform/external/lzma between android-6.0.1_r46..android-6.0.1_r54========= Asm/arm/7zCrcOpt.asm | 0 Asm/x86/7zAsm.asm | 28 +- Asm/x86/7zCrcOpt.asm | 0 Asm/x86/AesOpt.asm | 0 Asm/x86/XzCrc64Opt.asm | 205 ++ C/7z.h | 175 +- C/7zAlloc.c | 2 + C/7zAlloc.h | 0 C/7zArcIn.c | 1839 +++++++++++ C/7zBuf.c | 6 +- C/7zBuf.h | 12 +- C/7zBuf2.c | 5 +- C/7zCrc.c | 69 +- C/7zCrc.h | 4 +- C/7zCrcOpt.c | 40 +- C/7zDec.c | 109 +- C/7zFile.c | 2 + C/7zFile.h | 4 +- C/7zIn.c | 1402 --------- C/7zStream.c | 6 +- C/{Types.h => 7zTypes.h} | 14 +- C/7zVersion.h | 11 +- C/7zVersion.rc | 55 + C/Aes.c | 284 ++ C/Aes.h | 38 + C/AesOpt.c | 184 ++ C/Alloc.c | 6 +- C/Alloc.h | 0 C/Android.mk | 57 + C/Bcj2.c | 2 + C/Bcj2.h | 12 +- C/Bra.c | 2 + C/Bra.h | 12 +- C/Bra86.c | 99 +- C/BraIA64.c | 4 +- C/Compiler.h | 28 + C/CpuArch.c | 26 +- C/CpuArch.h | 16 +- C/Delta.c | 2 + C/Delta.h | 12 +- C/LzFind.c | 2 + C/LzFind.h | 12 +- C/LzFindMt.c | 17 +- C/LzFindMt.h | 10 +- C/LzHash.h | 0 C/Lzma2Dec.c | 28 +- C/Lzma2Dec.h | 10 +- C/Lzma2Enc.c | 22 +- C/Lzma2Enc.h | 10 +- C/Lzma86.h | 4 +- C/Lzma86Dec.c | 0 C/Lzma86Enc.c | 2 +- C/LzmaDec.c | 66 +- C/LzmaDec.h | 12 +- C/LzmaEnc.c | 40 +- C/LzmaEnc.h | 14 +- C/LzmaLib.c | 0 C/LzmaLib.h | 12 +- C/MtCoder.c | 2 + C/MtCoder.h | 0 C/Ppmd.h | 8 +- C/Ppmd7.c | 2 + C/Ppmd7.h | 0 C/Ppmd7Dec.c | 2 + C/Ppmd7Enc.c | 2 + C/Precomp.h | 10 + C/RotateDefs.h | 8 +- C/Sha256.c | 2 + C/Sha256.h | 4 +- C/Sort.c | 141 + C/Sort.h | 18 + C/Threads.c | 27 +- C/Threads.h | 26 +- C/Util/7z/7z.dsp | 33 +- C/Util/7z/7z.dsw | 0 C/Util/7z/7zMain.c | 159 +- C/Util/7z/Precomp.c | 4 + C/Util/7z/Precomp.h | 10 + C/Util/7z/makefile | 12 +- C/Util/7z/makefile.gcc | 10 +- C/Util/Lzma/Android.mk | 10 - C/Util/Lzma/LzmaUtil.c | 6 +- C/Util/Lzma/LzmaUtil.dsp | 4 +- C/Util/Lzma/LzmaUtil.dsw | 0 C/Util/Lzma/makefile | 2 +- C/Util/Lzma/makefile.gcc | 0 C/Util/LzmaLib/LzmaLib.def | 0 C/Util/LzmaLib/LzmaLib.dsp | 8 +- C/Util/LzmaLib/LzmaLib.dsw | 0 C/Util/LzmaLib/LzmaLibExports.c | 0 C/Util/LzmaLib/makefile | 0 C/Util/LzmaLib/resource.rc | 3 +- C/Util/SfxSetup/Precomp.c | 4 + C/Util/SfxSetup/Precomp.h | 10 + C/Util/SfxSetup/SfxSetup.c | 111 +- C/Util/SfxSetup/SfxSetup.dsp | 23 +- C/Util/SfxSetup/SfxSetup.dsw | 0 C/Util/SfxSetup/makefile | 4 +- C/Util/SfxSetup/makefile_con | 5 +- C/Util/SfxSetup/resource.rc | 3 +- C/Util/SfxSetup/setup.ico | Bin C/Xz.c | 2 + C/Xz.h | 45 +- C/XzCrc64.c | 89 +- C/XzCrc64.h | 4 +- C/XzCrc64Opt.c | 69 + C/XzDec.c | 84 +- C/XzEnc.c | 299 +- C/XzEnc.h | 32 +- C/XzIn.c | 49 +- CPP/7zip/7zip.mak | 240 ++ CPP/7zip/Aes.mak | 0 CPP/7zip/Archive/7z/7zCompressionMode.cpp | 0 CPP/7zip/Archive/7z/7zCompressionMode.h | 9 +- CPP/7zip/Archive/7z/7zDecode.cpp | 123 +- CPP/7zip/Archive/7z/7zDecode.h | 9 +- CPP/7zip/Archive/7z/7zEncode.cpp | 106 +- CPP/7zip/Archive/7z/7zEncode.h | 2 + CPP/7zip/Archive/7z/7zExtract.cpp | 46 +- CPP/7zip/Archive/7z/7zFolderInStream.cpp | 4 +- CPP/7zip/Archive/7z/7zFolderInStream.h | 2 +- CPP/7zip/Archive/7z/7zFolderOutStream.cpp | 2 +- CPP/7zip/Archive/7z/7zFolderOutStream.h | 6 +- CPP/7zip/Archive/7z/7zHandler.cpp | 715 +++-- CPP/7zip/Archive/7z/7zHandler.h | 80 +- CPP/7zip/Archive/7z/7zHandlerOut.cpp | 698 ++++- CPP/7zip/Archive/7z/7zHeader.cpp | 5 + CPP/7zip/Archive/7z/7zHeader.h | 10 +- CPP/7zip/Archive/7z/7zIn.cpp | 1429 +++++---- CPP/7zip/Archive/7z/7zIn.h | 335 +- CPP/7zip/Archive/7z/7zItem.h | 208 +- CPP/7zip/Archive/7z/7zOut.cpp | 463 +-- CPP/7zip/Archive/7z/7zOut.h | 207 +- CPP/7zip/Archive/7z/7zProperties.cpp | 48 +- CPP/7zip/Archive/7z/7zProperties.h | 0 CPP/7zip/Archive/7z/7zRegister.cpp | 23 +- CPP/7zip/Archive/7z/7zSpecStream.cpp | 10 +- CPP/7zip/Archive/7z/7zSpecStream.h | 0 CPP/7zip/Archive/7z/7zUpdate.cpp | 682 +++-- CPP/7zip/Archive/7z/7zUpdate.h | 40 +- CPP/7zip/Archive/7z/StdAfx.cpp | 0 CPP/7zip/Archive/7z/StdAfx.h | 3 +- CPP/7zip/Archive/Archive.def | 0 CPP/7zip/Archive/Archive2.def | 4 +- CPP/7zip/Archive/ArchiveExports.cpp | 66 +- CPP/7zip/Archive/Common/CoderMixer2.cpp | 70 +- CPP/7zip/Archive/Common/CoderMixer2.h | 19 +- CPP/7zip/Archive/Common/CoderMixer2MT.cpp | 58 +- CPP/7zip/Archive/Common/CoderMixer2MT.h | 13 +- CPP/7zip/Archive/Common/CrossThreadProgress.cpp | 0 CPP/7zip/Archive/Common/CrossThreadProgress.h | 0 CPP/7zip/Archive/Common/DummyOutStream.cpp | 19 +- CPP/7zip/Archive/Common/DummyOutStream.h | 7 +- CPP/7zip/Archive/Common/HandlerOut.cpp | 614 +--- CPP/7zip/Archive/Common/HandlerOut.h | 80 +- CPP/7zip/Archive/Common/InStreamWithCRC.cpp | 32 +- CPP/7zip/Archive/Common/InStreamWithCRC.h | 0 CPP/7zip/Archive/Common/ItemNameUtils.cpp | 41 +- CPP/7zip/Archive/Common/ItemNameUtils.h | 7 +- CPP/7zip/Archive/Common/MultiStream.cpp | 43 +- CPP/7zip/Archive/Common/MultiStream.h | 11 +- CPP/7zip/Archive/Common/OutStreamWithCRC.cpp | 0 CPP/7zip/Archive/Common/OutStreamWithCRC.h | 1 + CPP/7zip/Archive/Common/ParseProperties.cpp | 174 -- CPP/7zip/Archive/Common/ParseProperties.h | 16 +- CPP/7zip/Archive/Common/StdAfx.h | 3 +- CPP/7zip/Archive/DllExports2.cpp | 30 +- CPP/7zip/Archive/IArchive.h | 336 +- CPP/7zip/Archive/Icons/7z.ico | Bin CPP/7zip/Archive/LzmaHandler.cpp | 328 +- CPP/7zip/Archive/SplitHandler.cpp | 275 +- CPP/7zip/Archive/StdAfx.h | 3 +- CPP/7zip/Archive/XzHandler.cpp | 746 +++-- CPP/7zip/Asm.mak | 2 + CPP/7zip/Bundles/Alone7z/Alone.dsp | 197 +- CPP/7zip/Bundles/Alone7z/Alone.dsw | 0 CPP/7zip/Bundles/Alone7z/StdAfx.cpp | 0 CPP/7zip/Bundles/Alone7z/StdAfx.h | 3 +- CPP/7zip/Bundles/Alone7z/makefile | 105 +- CPP/7zip/Bundles/Alone7z/resource.rc | 4 +- CPP/7zip/Bundles/Format7zExtractR/StdAfx.cpp | 0 CPP/7zip/Bundles/Format7zExtractR/StdAfx.h | 3 +- CPP/7zip/Bundles/Format7zExtractR/makefile | 43 +- CPP/7zip/Bundles/Format7zExtractR/resource.rc | 4 +- CPP/7zip/Bundles/Format7zR/StdAfx.cpp | 0 CPP/7zip/Bundles/Format7zR/StdAfx.h | 3 +- CPP/7zip/Bundles/Format7zR/makefile | 45 +- CPP/7zip/Bundles/Format7zR/resource.rc | 4 +- CPP/7zip/Bundles/LzmaCon/LzmaAlone.cpp | 138 +- CPP/7zip/Bundles/LzmaCon/LzmaCon.dsp | 24 +- CPP/7zip/Bundles/LzmaCon/LzmaCon.dsw | 0 CPP/7zip/Bundles/LzmaCon/StdAfx.cpp | 0 CPP/7zip/Bundles/LzmaCon/StdAfx.h | 2 +- CPP/7zip/Bundles/LzmaCon/makefile | 40 +- CPP/7zip/Bundles/LzmaCon/makefile.gcc | 69 +- CPP/7zip/Bundles/LzmaCon/resource.rc | 3 + CPP/7zip/Bundles/LzmaSpec/LzmaSpec.cpp | 713 +++++ CPP/7zip/Bundles/SFXCon/7z.ico | Bin 0 -> 1078 bytes CPP/7zip/Bundles/SFXCon/SFXCon.dsp | 837 +++++ CPP/7zip/Bundles/SFXCon/SFXCon.dsw | 29 + CPP/7zip/Bundles/SFXCon/SfxCon.cpp | 453 +++ CPP/7zip/Bundles/SFXCon/StdAfx.cpp | 3 + CPP/7zip/Bundles/SFXCon/StdAfx.h | 8 + CPP/7zip/Bundles/SFXCon/makefile | 124 + CPP/7zip/Bundles/SFXCon/resource.rc | 5 + CPP/7zip/Bundles/SFXSetup/ExtractCallbackSfx.cpp | 238 ++ CPP/7zip/Bundles/SFXSetup/ExtractCallbackSfx.h | 86 + CPP/7zip/Bundles/SFXSetup/ExtractEngine.cpp | 138 + CPP/7zip/Bundles/SFXSetup/ExtractEngine.h | 11 + CPP/7zip/Bundles/SFXSetup/SFXSetup.dsp | 752 +++++ CPP/7zip/Bundles/SFXSetup/SFXSetup.dsw | 29 + CPP/7zip/Bundles/SFXSetup/SfxSetup.cpp | 356 +++ CPP/7zip/Bundles/SFXSetup/StdAfx.cpp | 3 + CPP/7zip/Bundles/SFXSetup/StdAfx.h | 13 + CPP/7zip/Bundles/SFXSetup/makefile | 107 + CPP/7zip/Bundles/SFXSetup/resource.h | 6 + CPP/7zip/Bundles/SFXSetup/resource.rc | 16 + CPP/7zip/Bundles/SFXSetup/setup.ico | Bin 0 -> 1078 bytes CPP/7zip/Bundles/SFXWin/7z.ico | Bin 0 -> 1078 bytes CPP/7zip/Bundles/SFXWin/SFXWin.dsp | 937 ++++++ CPP/7zip/Bundles/SFXWin/SFXWin.dsw | 29 + CPP/7zip/Bundles/SFXWin/SfxWin.cpp | 233 ++ CPP/7zip/Bundles/SFXWin/StdAfx.cpp | 3 + CPP/7zip/Bundles/SFXWin/StdAfx.h | 14 + CPP/7zip/Bundles/SFXWin/makefile | 143 + CPP/7zip/Bundles/SFXWin/resource.h | 1 + CPP/7zip/Bundles/SFXWin/resource.rc | 50 + CPP/7zip/Common/CWrappers.cpp | 44 +- CPP/7zip/Common/CWrappers.h | 33 +- CPP/7zip/Common/CreateCoder.cpp | 218 +- CPP/7zip/Common/CreateCoder.h | 41 +- CPP/7zip/Common/FilePathAutoRename.cpp | 28 +- CPP/7zip/Common/FilePathAutoRename.h | 10 +- CPP/7zip/Common/FileStreams.cpp | 187 +- CPP/7zip/Common/FileStreams.h | 72 +- CPP/7zip/Common/FilterCoder.cpp | 20 +- CPP/7zip/Common/FilterCoder.h | 22 +- CPP/7zip/Common/InBuffer.cpp | 122 +- CPP/7zip/Common/InBuffer.h | 99 +- CPP/7zip/Common/InOutTempBuffer.cpp | 15 +- CPP/7zip/Common/InOutTempBuffer.h | 4 +- CPP/7zip/Common/LimitedStreams.cpp | 253 +- CPP/7zip/Common/LimitedStreams.h | 138 +- CPP/7zip/Common/LockedStream.cpp | 0 CPP/7zip/Common/LockedStream.h | 0 CPP/7zip/Common/MethodId.cpp | 24 - CPP/7zip/Common/MethodId.h | 2 +- CPP/7zip/Common/MethodProps.cpp | 484 ++- CPP/7zip/Common/MethodProps.h | 178 +- CPP/7zip/Common/OffsetStream.cpp | 12 +- CPP/7zip/Common/OffsetStream.h | 7 +- CPP/7zip/Common/OutBuffer.cpp | 57 +- CPP/7zip/Common/OutBuffer.h | 35 +- CPP/7zip/Common/ProgressUtils.cpp | 2 +- CPP/7zip/Common/ProgressUtils.h | 0 CPP/7zip/Common/PropId.cpp | 99 + CPP/7zip/Common/RegisterArc.h | 47 +- CPP/7zip/Common/RegisterCodec.h | 26 +- CPP/7zip/Common/StdAfx.h | 3 +- CPP/7zip/Common/StreamBinder.cpp | 148 +- CPP/7zip/Common/StreamBinder.h | 36 +- CPP/7zip/Common/StreamObjects.cpp | 73 +- CPP/7zip/Common/StreamObjects.h | 29 +- CPP/7zip/Common/StreamUtils.cpp | 8 +- CPP/7zip/Common/StreamUtils.h | 12 +- CPP/7zip/Common/UniqBlocks.cpp | 56 + CPP/7zip/Common/UniqBlocks.h | 30 + CPP/7zip/Common/VirtThread.cpp | 14 +- CPP/7zip/Common/VirtThread.h | 11 +- CPP/7zip/Compress/Bcj2Coder.cpp | 172 +- CPP/7zip/Compress/Bcj2Coder.h | 55 +- CPP/7zip/Compress/Bcj2Register.cpp | 0 CPP/7zip/Compress/BcjCoder.cpp | 0 CPP/7zip/Compress/BcjCoder.h | 0 CPP/7zip/Compress/BcjRegister.cpp | 0 CPP/7zip/Compress/BranchCoder.cpp | 0 CPP/7zip/Compress/BranchCoder.h | 0 CPP/7zip/Compress/BranchMisc.cpp | 42 +- CPP/7zip/Compress/BranchMisc.h | 0 CPP/7zip/Compress/BranchRegister.cpp | 0 CPP/7zip/Compress/ByteSwap.cpp | 0 CPP/7zip/Compress/CodecExports.cpp | 179 +- CPP/7zip/Compress/CopyCoder.cpp | 21 +- CPP/7zip/Compress/CopyCoder.h | 1 + CPP/7zip/Compress/CopyRegister.cpp | 0 CPP/7zip/Compress/DeltaFilter.cpp | 17 +- CPP/7zip/Compress/Lzma2Decoder.cpp | 0 CPP/7zip/Compress/Lzma2Decoder.h | 0 CPP/7zip/Compress/Lzma2Encoder.cpp | 0 CPP/7zip/Compress/Lzma2Encoder.h | 0 CPP/7zip/Compress/Lzma2Register.cpp | 0 CPP/7zip/Compress/LzmaDecoder.cpp | 16 +- CPP/7zip/Compress/LzmaDecoder.h | 6 +- CPP/7zip/Compress/LzmaEncoder.cpp | 34 +- CPP/7zip/Compress/LzmaEncoder.h | 2 + CPP/7zip/Compress/LzmaRegister.cpp | 0 CPP/7zip/Compress/PpmdDecoder.cpp | 167 + CPP/7zip/Compress/PpmdDecoder.h | 0 CPP/7zip/Compress/PpmdEncoder.cpp | 67 +- CPP/7zip/Compress/PpmdEncoder.h | 57 + CPP/7zip/Compress/PpmdRegister.cpp | 0 CPP/7zip/Compress/RangeCoder.h | 26 +- CPP/7zip/Compress/RangeCoderBit.h | 16 +- CPP/7zip/Compress/StdAfx.h | 2 +- CPP/7zip/Crc.mak | 0 CPP/7zip/Crc64.mak | 8 + CPP/7zip/Crypto/7zAes.cpp | 240 ++ CPP/7zip/Crypto/7zAes.h | 117 + CPP/7zip/Crypto/7zAesRegister.cpp | 18 + CPP/7zip/Crypto/MyAes.cpp | 112 + CPP/7zip/Crypto/MyAes.h | 52 + CPP/7zip/Crypto/MyAesReg.cpp | 19 + CPP/7zip/Crypto/RandGen.cpp | 115 + CPP/7zip/Crypto/RandGen.h | 21 + CPP/7zip/Crypto/StdAfx.h | 8 + CPP/7zip/GuiCommon.rc | 81 + CPP/7zip/Guid.txt | 32 +- CPP/7zip/ICoder.h | 29 +- CPP/7zip/IDecl.h | 0 CPP/7zip/IPassword.h | 3 +- CPP/7zip/IProgress.h | 2 +- CPP/7zip/IStream.h | 89 +- CPP/7zip/MyVersion.h | 12 +- CPP/7zip/MyVersionInfo.rc | 52 +- CPP/7zip/PropID.h | 66 +- CPP/7zip/SubBuild.mak | 0 CPP/7zip/UI/Client7z/Client7z.cpp | 250 +- CPP/7zip/UI/Client7z/Client7z.dsp | 21 +- CPP/7zip/UI/Client7z/Client7z.dsw | 0 CPP/7zip/UI/Client7z/StdAfx.cpp | 0 CPP/7zip/UI/Client7z/StdAfx.h | 3 +- CPP/7zip/UI/Client7z/makefile | 25 +- CPP/7zip/UI/Client7z/resource.rc | 3 + CPP/7zip/UI/Common/ArchiveCommandLine.cpp | 1123 ++++--- CPP/7zip/UI/Common/ArchiveCommandLine.h | 79 +- CPP/7zip/UI/Common/ArchiveExtractCallback.cpp | 995 +++++- CPP/7zip/UI/Common/ArchiveExtractCallback.h | 204 +- CPP/7zip/UI/Common/ArchiveName.cpp | 44 +- CPP/7zip/UI/Common/ArchiveName.h | 9 +- CPP/7zip/UI/Common/ArchiveOpenCallback.cpp | 40 +- CPP/7zip/UI/Common/ArchiveOpenCallback.h | 34 +- CPP/7zip/UI/Common/Bench.cpp | 1910 ++++++++++-- CPP/7zip/UI/Common/Bench.h | 35 +- CPP/7zip/UI/Common/DefaultName.cpp | 6 +- CPP/7zip/UI/Common/DefaultName.h | 6 +- CPP/7zip/UI/Common/DirItem.h | 87 +- CPP/7zip/UI/Common/EnumDirItems.cpp | 674 +++- CPP/7zip/UI/Common/EnumDirItems.h | 18 +- CPP/7zip/UI/Common/ExitCode.h | 0 CPP/7zip/UI/Common/Extract.cpp | 368 ++- CPP/7zip/UI/Common/Extract.h | 52 +- CPP/7zip/UI/Common/ExtractMode.h | 40 +- CPP/7zip/UI/Common/ExtractingFilePath.cpp | 112 +- CPP/7zip/UI/Common/ExtractingFilePath.h | 12 +- CPP/7zip/UI/Common/HashCalc.cpp | 361 +++ CPP/7zip/UI/Common/HashCalc.h | 107 + CPP/7zip/UI/Common/IFileExtractCallback.h | 32 +- CPP/7zip/UI/Common/LoadCodecs.cpp | 771 +++-- CPP/7zip/UI/Common/LoadCodecs.h | 188 +- CPP/7zip/UI/Common/OpenArchive.cpp | 3231 ++++++++++++++++++-- CPP/7zip/UI/Common/OpenArchive.h | 351 ++- CPP/7zip/UI/Common/PropIDUtils.cpp | 547 +++- CPP/7zip/UI/Common/PropIDUtils.h | 13 +- CPP/7zip/UI/Common/Property.h | 6 +- CPP/7zip/UI/Common/SetProperties.cpp | 29 +- CPP/7zip/UI/Common/SetProperties.h | 0 CPP/7zip/UI/Common/SortUtils.cpp | 17 +- CPP/7zip/UI/Common/SortUtils.h | 8 +- CPP/7zip/UI/Common/StdAfx.h | 5 +- CPP/7zip/UI/Common/TempFiles.cpp | 9 +- CPP/7zip/UI/Common/TempFiles.h | 8 +- CPP/7zip/UI/Common/Update.cpp | 1099 +++++-- CPP/7zip/UI/Common/Update.h | 141 +- CPP/7zip/UI/Common/UpdateAction.cpp | 10 +- CPP/7zip/UI/Common/UpdateAction.h | 23 +- CPP/7zip/UI/Common/UpdateCallback.cpp | 447 ++- CPP/7zip/UI/Common/UpdateCallback.h | 64 +- CPP/7zip/UI/Common/UpdatePair.cpp | 203 +- CPP/7zip/UI/Common/UpdatePair.h | 4 +- CPP/7zip/UI/Common/UpdateProduce.cpp | 21 +- CPP/7zip/UI/Common/UpdateProduce.h | 24 +- CPP/7zip/UI/Common/WorkDir.cpp | 56 +- CPP/7zip/UI/Common/WorkDir.h | 22 +- CPP/7zip/UI/Common/ZipRegistry.h | 25 +- CPP/7zip/UI/Console/BenchCon.cpp | 291 +- CPP/7zip/UI/Console/BenchCon.h | 8 +- CPP/7zip/UI/Console/Console.mak | 35 + CPP/7zip/UI/Console/ConsoleClose.cpp | 0 CPP/7zip/UI/Console/ConsoleClose.h | 0 CPP/7zip/UI/Console/ExtractCallbackConsole.cpp | 245 +- CPP/7zip/UI/Console/ExtractCallbackConsole.h | 42 +- CPP/7zip/UI/Console/HashCon.cpp | 274 ++ CPP/7zip/UI/Console/HashCon.h | 26 + CPP/7zip/UI/Console/List.cpp | 1220 +++++--- CPP/7zip/UI/Console/List.h | 15 +- CPP/7zip/UI/Console/Main.cpp | 833 +++-- CPP/7zip/UI/Console/MainAr.cpp | 20 +- CPP/7zip/UI/Console/OpenCallbackConsole.cpp | 6 +- CPP/7zip/UI/Console/OpenCallbackConsole.h | 7 +- CPP/7zip/UI/Console/PercentPrinter.cpp | 40 +- CPP/7zip/UI/Console/PercentPrinter.h | 11 +- CPP/7zip/UI/Console/StdAfx.cpp | 0 CPP/7zip/UI/Console/StdAfx.h | 3 +- CPP/7zip/UI/Console/UpdateCallbackConsole.cpp | 39 +- CPP/7zip/UI/Console/UpdateCallbackConsole.h | 57 +- CPP/7zip/UI/Console/UserInputUtils.cpp | 41 +- CPP/7zip/UI/Console/UserInputUtils.h | 6 +- CPP/7zip/UI/Console/makefile | 89 +- CPP/7zip/UI/Console/resource.rc | 0 CPP/7zip/UI/Explorer/MyMessages.cpp | 37 + CPP/7zip/UI/Explorer/MyMessages.h | 16 + CPP/7zip/UI/FileManager/BrowseDialog.cpp | 1008 ++++++ CPP/7zip/UI/FileManager/BrowseDialog.h | 21 + CPP/7zip/UI/FileManager/BrowseDialogRes.h | 9 + CPP/7zip/UI/FileManager/ComboDialog.cpp | 64 + CPP/7zip/UI/FileManager/ComboDialog.h | 28 + CPP/7zip/UI/FileManager/ComboDialogRes.h | 4 + CPP/7zip/UI/FileManager/DialogSize.h | 16 + CPP/7zip/UI/FileManager/ExtractCallback.cpp | 898 ++++++ CPP/7zip/UI/FileManager/ExtractCallback.h | 330 ++ CPP/7zip/UI/FileManager/FormatUtils.cpp | 28 + CPP/7zip/UI/FileManager/FormatUtils.h | 14 + CPP/7zip/UI/FileManager/LangUtils.h | 38 + CPP/7zip/UI/FileManager/MyWindowsNew.h | 76 + CPP/7zip/UI/FileManager/OverwriteDialog.cpp | 119 + CPP/7zip/UI/FileManager/OverwriteDialog.h | 69 + CPP/7zip/UI/FileManager/OverwriteDialog.rc | 91 + CPP/7zip/UI/FileManager/OverwriteDialogRes.h | 17 + CPP/7zip/UI/FileManager/PasswordDialog.cpp | 58 + CPP/7zip/UI/FileManager/PasswordDialog.h | 28 + CPP/7zip/UI/FileManager/PasswordDialog.rc | 14 + CPP/7zip/UI/FileManager/PasswordDialogRes.h | 5 + CPP/7zip/UI/FileManager/ProgressDialog.cpp | 196 ++ CPP/7zip/UI/FileManager/ProgressDialog.h | 170 + CPP/7zip/UI/FileManager/ProgressDialog.rc | 12 + CPP/7zip/UI/FileManager/ProgressDialog2.cpp | 1293 ++++++++ CPP/7zip/UI/FileManager/ProgressDialog2.h | 314 ++ CPP/7zip/UI/FileManager/ProgressDialog2.rc | 40 + CPP/7zip/UI/FileManager/ProgressDialog2Res.h | 48 + CPP/7zip/UI/FileManager/ProgressDialog2a.rc | 80 + CPP/7zip/UI/FileManager/ProgressDialogRes.h | 3 + CPP/7zip/UI/FileManager/PropertyNameRes.h | 92 + CPP/7zip/UI/FileManager/SysIconUtils.cpp | 253 ++ CPP/7zip/UI/FileManager/SysIconUtils.h | 58 + CPP/7zip/UI/FileManager/resource.h | 171 ++ CPP/7zip/UI/FileManager/resourceGui.h | 15 + CPP/7zip/UI/GUI/Extract.rc | 52 + CPP/7zip/UI/GUI/ExtractDialog.cpp | 418 +++ CPP/7zip/UI/GUI/ExtractDialog.h | 113 + CPP/7zip/UI/GUI/ExtractDialog.rc | 98 + CPP/7zip/UI/GUI/ExtractDialogRes.h | 24 + CPP/7zip/UI/GUI/ExtractGUI.cpp | 270 ++ CPP/7zip/UI/GUI/ExtractGUI.h | 38 + CPP/7zip/UI/GUI/ExtractRes.h | 44 + CPP/7zip/UI/GUI/HashGUI.h | 16 + CPP/7zip/UI/GUI/resource2.h | 2 + CPP/Build.mak | 43 +- CPP/Common/AutoPtr.h | 0 CPP/Common/Buffer.h | 77 - CPP/Common/CRC.cpp | 0 CPP/Common/C_FileIO.cpp | 6 +- CPP/Common/C_FileIO.h | 8 +- CPP/Common/ComTry.h | 0 CPP/Common/CommandLineParser.cpp | 267 +- CPP/Common/CommandLineParser.h | 49 +- CPP/Common/Common.h | 13 + CPP/Common/CrcReg.cpp | 111 + CPP/Common/Defs.h | 0 CPP/Common/DynamicBuffer.h | 72 +- CPP/Common/IntToString.cpp | 149 +- CPP/Common/IntToString.h | 23 +- CPP/Common/Lang.h | 23 + CPP/Common/ListFileUtils.cpp | 120 +- CPP/Common/ListFileUtils.h | 11 +- CPP/Common/MyBuffer.h | 237 ++ CPP/Common/MyCom.h | 63 +- CPP/Common/MyException.h | 0 CPP/Common/MyGuidDef.h | 2 +- CPP/Common/MyInitGuid.h | 23 + CPP/Common/MyString.cpp | 1175 ++++++- CPP/Common/MyString.h | 916 +++--- CPP/Common/MyTypes.h | 30 + CPP/Common/MyUnknown.h | 0 CPP/Common/MyVector.cpp | 84 - CPP/Common/MyVector.h | 575 +++- CPP/Common/MyWindows.cpp | 145 + CPP/Common/MyWindows.h | 30 +- CPP/Common/NewHandler.cpp | 64 +- CPP/Common/NewHandler.h | 56 +- CPP/Common/Sha256Reg.cpp | 52 + CPP/Common/StdAfx.h | 3 +- CPP/Common/StdInStream.cpp | 25 +- CPP/Common/StdInStream.h | 21 +- CPP/Common/StdOutStream.cpp | 86 +- CPP/Common/StdOutStream.h | 61 +- CPP/Common/StringConvert.cpp | 90 +- CPP/Common/StringConvert.h | 10 +- CPP/Common/StringToInt.cpp | 144 +- CPP/Common/StringToInt.h | 23 +- CPP/Common/TextConfig.cpp | 124 + CPP/Common/TextConfig.h | 21 + CPP/Common/Types.h | 11 - CPP/Common/UTFConvert.cpp | 59 +- CPP/Common/UTFConvert.h | 5 +- CPP/Common/Wildcard.cpp | 389 ++- CPP/Common/Wildcard.h | 101 +- CPP/Common/XzCrc64Reg.cpp | 54 + CPP/Windows/COM.h | 68 + CPP/Windows/CommonDialog.cpp | 183 ++ CPP/Windows/CommonDialog.h | 23 + CPP/Windows/Control/ComboBox.cpp | 58 + CPP/Windows/Control/ComboBox.h | 63 + CPP/Windows/Control/CommandBar.h | 48 + CPP/Windows/Control/Dialog.cpp | 250 ++ CPP/Windows/Control/Dialog.h | 167 + CPP/Windows/Control/Edit.h | 19 + CPP/Windows/Control/ImageList.cpp | 10 + CPP/Windows/Control/ImageList.h | 87 + CPP/Windows/Control/ListView.cpp | 155 + CPP/Windows/Control/ListView.h | 132 + CPP/Windows/Control/ProgressBar.h | 31 + CPP/Windows/Control/PropertyPage.cpp | 143 + CPP/Windows/Control/PropertyPage.h | 48 + CPP/Windows/Control/ReBar.h | 34 + CPP/Windows/Control/Static.h | 28 + CPP/Windows/Control/StatusBar.h | 42 + CPP/Windows/Control/StdAfx.h | 8 + CPP/Windows/Control/ToolBar.h | 43 + CPP/Windows/Control/Trackbar.h | 28 + CPP/Windows/Control/Window2.cpp | 200 ++ CPP/Windows/Control/Window2.h | 51 + CPP/Windows/DLL.cpp | 130 +- CPP/Windows/DLL.h | 23 +- CPP/Windows/Defs.h | 0 CPP/Windows/Error.cpp | 50 - CPP/Windows/Error.h | 33 - CPP/Windows/ErrorMsg.cpp | 61 + CPP/Windows/ErrorMsg.h | 15 + CPP/Windows/FileDir.cpp | 1052 +++---- CPP/Windows/FileDir.h | 180 +- CPP/Windows/FileFind.cpp | 603 ++-- CPP/Windows/FileFind.h | 127 +- CPP/Windows/FileIO.cpp | 434 ++- CPP/Windows/FileIO.h | 211 +- CPP/Windows/FileLink.cpp | 426 +++ CPP/Windows/FileMapping.cpp | 2 +- CPP/Windows/FileMapping.h | 8 +- CPP/Windows/FileName.cpp | 675 +++- CPP/Windows/FileName.h | 69 +- CPP/Windows/FileSystem.cpp | 131 + CPP/Windows/FileSystem.h | 27 + CPP/Windows/Handle.h | 0 CPP/Windows/MemoryLock.cpp | 98 +- CPP/Windows/MemoryLock.h | 27 +- CPP/Windows/NtCheck.h | 0 CPP/Windows/PropVariant.cpp | 105 +- CPP/Windows/PropVariant.h | 97 +- CPP/Windows/PropVariantConv.cpp | 99 + CPP/Windows/PropVariantConv.h | 30 + CPP/Windows/PropVariantConversions.cpp | 105 - CPP/Windows/PropVariantConversions.h | 14 - CPP/Windows/Registry.cpp | 89 +- CPP/Windows/Registry.h | 41 +- CPP/Windows/ResourceString.cpp | 103 + CPP/Windows/ResourceString.h | 16 + CPP/Windows/SecurityUtils.cpp | 179 ++ CPP/Windows/SecurityUtils.h | 167 + CPP/Windows/Shell.cpp | 334 ++ CPP/Windows/Shell.h | 94 + CPP/Windows/StdAfx.h | 3 +- CPP/Windows/Synchronization.cpp | 0 CPP/Windows/Synchronization.h | 0 CPP/Windows/System.cpp | 0 CPP/Windows/System.h | 2 +- CPP/Windows/Thread.h | 0 CPP/Windows/Time.h | 21 - CPP/Windows/{Time.cpp => TimeUtils.cpp} | 63 +- CPP/Windows/TimeUtils.h | 23 + CPP/Windows/Window.cpp | 169 + CPP/Windows/Window.h | 283 ++ CS/7zip/Common/CRC.cs | 0 CS/7zip/Common/CommandLineParser.cs | 0 CS/7zip/Common/InBuffer.cs | 0 CS/7zip/Common/OutBuffer.cs | 0 CS/7zip/Compress/LZ/IMatchFinder.cs | 0 CS/7zip/Compress/LZ/LzBinTree.cs | 0 CS/7zip/Compress/LZ/LzInWindow.cs | 0 CS/7zip/Compress/LZ/LzOutWindow.cs | 0 CS/7zip/Compress/LZMA/LzmaBase.cs | 0 CS/7zip/Compress/LZMA/LzmaDecoder.cs | 0 CS/7zip/Compress/LZMA/LzmaEncoder.cs | 0 CS/7zip/Compress/LzmaAlone/LzmaAlone.cs | 0 CS/7zip/Compress/LzmaAlone/LzmaAlone.csproj | 0 CS/7zip/Compress/LzmaAlone/LzmaAlone.sln | 0 CS/7zip/Compress/LzmaAlone/LzmaBench.cs | 0 .../Compress/LzmaAlone/Properties/AssemblyInfo.cs | 0 CS/7zip/Compress/LzmaAlone/Properties/Resources.cs | 0 CS/7zip/Compress/LzmaAlone/Properties/Settings.cs | 0 CS/7zip/Compress/RangeCoder/RangeCoder.cs | 0 CS/7zip/Compress/RangeCoder/RangeCoderBit.cs | 0 CS/7zip/Compress/RangeCoder/RangeCoderBitTree.cs | 0 CS/7zip/ICoder.cs | 0 7zC.txt => DOC/7zC.txt | 19 +- 7zFormat.txt => DOC/7zFormat.txt | 84 +- Methods.txt => DOC/Methods.txt | 46 +- DOC/installer.txt | 166 + history.txt => DOC/lzma-history.txt | 35 + DOC/lzma-sdk.txt | 356 +++ DOC/lzma-specification.txt | 1175 +++++++ DOC/lzma.txt | 328 ++ Java/SevenZip/CRC.java | 0 Java/SevenZip/Compression/LZ/BinTree.java | 0 Java/SevenZip/Compression/LZ/InWindow.java | 0 Java/SevenZip/Compression/LZ/OutWindow.java | 0 Java/SevenZip/Compression/LZMA/Base.java | 0 Java/SevenZip/Compression/LZMA/Decoder.java | 0 Java/SevenZip/Compression/LZMA/Encoder.java | 0 .../Compression/RangeCoder/BitTreeDecoder.java | 0 .../Compression/RangeCoder/BitTreeEncoder.java | 0 Java/SevenZip/Compression/RangeCoder/Decoder.java | 0 Java/SevenZip/Compression/RangeCoder/Encoder.java | 0 Java/SevenZip/ICodeProgress.java | 0 Java/SevenZip/LzmaAlone.java | 0 Java/SevenZip/LzmaBench.java | 0 Java/Tukaani/Android.mk | 30 + Java/Tukaani/COPYING | 10 + Java/Tukaani/NEWS | 56 + Java/Tukaani/README | 50 + Java/Tukaani/THANKS | 16 + Java/Tukaani/build.properties | 29 + Java/Tukaani/build.xml | 143 + Java/Tukaani/fileset-misc.txt | 11 + Java/Tukaani/fileset-src.txt | 100 + Java/Tukaani/maven/README | 2 + Java/Tukaani/maven/pom_template.xml | 58 + Java/Tukaani/src/LZMADecDemo.java | 80 + Java/Tukaani/src/XZDecDemo.java | 71 + Java/Tukaani/src/XZEncDemo.java | 41 + Java/Tukaani/src/XZSeekDecDemo.java | 75 + Java/Tukaani/src/XZSeekEncDemo.java | 68 + Java/Tukaani/src/org/tukaani/xz/ARMOptions.java | 36 + .../src/org/tukaani/xz/ARMThumbOptions.java | 36 + Java/Tukaani/src/org/tukaani/xz/BCJCoder.java | 35 + Java/Tukaani/src/org/tukaani/xz/BCJDecoder.java | 62 + Java/Tukaani/src/org/tukaani/xz/BCJEncoder.java | 48 + Java/Tukaani/src/org/tukaani/xz/BCJOptions.java | 57 + .../src/org/tukaani/xz/BlockInputStream.java | 284 ++ .../src/org/tukaani/xz/BlockOutputStream.java | 134 + .../org/tukaani/xz/CorruptedInputException.java | 37 + .../src/org/tukaani/xz/CountingInputStream.java | 45 + .../src/org/tukaani/xz/CountingOutputStream.java | 54 + Java/Tukaani/src/org/tukaani/xz/DeltaCoder.java | 26 + Java/Tukaani/src/org/tukaani/xz/DeltaDecoder.java | 32 + Java/Tukaani/src/org/tukaani/xz/DeltaEncoder.java | 36 + .../src/org/tukaani/xz/DeltaInputStream.java | 146 + Java/Tukaani/src/org/tukaani/xz/DeltaOptions.java | 102 + .../src/org/tukaani/xz/DeltaOutputStream.java | 113 + Java/Tukaani/src/org/tukaani/xz/FilterCoder.java | 16 + Java/Tukaani/src/org/tukaani/xz/FilterDecoder.java | 17 + Java/Tukaani/src/org/tukaani/xz/FilterEncoder.java | 17 + Java/Tukaani/src/org/tukaani/xz/FilterOptions.java | 80 + .../src/org/tukaani/xz/FinishableOutputStream.java | 31 + .../tukaani/xz/FinishableWrapperOutputStream.java | 70 + Java/Tukaani/src/org/tukaani/xz/IA64Options.java | 36 + .../org/tukaani/xz/IndexIndicatorException.java | 14 + Java/Tukaani/src/org/tukaani/xz/LZMA2Coder.java | 26 + Java/Tukaani/src/org/tukaani/xz/LZMA2Decoder.java | 35 + Java/Tukaani/src/org/tukaani/xz/LZMA2Encoder.java | 50 + .../src/org/tukaani/xz/LZMA2InputStream.java | 358 +++ Java/Tukaani/src/org/tukaani/xz/LZMA2Options.java | 581 ++++ .../src/org/tukaani/xz/LZMA2OutputStream.java | 261 ++ .../src/org/tukaani/xz/LZMAInputStream.java | 569 ++++ .../src/org/tukaani/xz/MemoryLimitException.java | 60 + .../Tukaani/src/org/tukaani/xz/PowerPCOptions.java | 36 + Java/Tukaani/src/org/tukaani/xz/RawCoder.java | 33 + Java/Tukaani/src/org/tukaani/xz/SPARCOptions.java | 36 + .../org/tukaani/xz/SeekableFileInputStream.java | 102 + .../src/org/tukaani/xz/SeekableInputStream.java | 81 + .../src/org/tukaani/xz/SeekableXZInputStream.java | 964 ++++++ .../src/org/tukaani/xz/SimpleInputStream.java | 138 + .../src/org/tukaani/xz/SimpleOutputStream.java | 151 + .../src/org/tukaani/xz/SingleXZInputStream.java | 375 +++ .../tukaani/xz/UncompressedLZMA2OutputStream.java | 153 + .../tukaani/xz/UnsupportedOptionsException.java | 34 + Java/Tukaani/src/org/tukaani/xz/X86Options.java | 36 + Java/Tukaani/src/org/tukaani/xz/XZ.java | 53 + .../src/org/tukaani/xz/XZFormatException.java | 24 + Java/Tukaani/src/org/tukaani/xz/XZIOException.java | 27 + Java/Tukaani/src/org/tukaani/xz/XZInputStream.java | 371 +++ .../Tukaani/src/org/tukaani/xz/XZOutputStream.java | 488 +++ Java/Tukaani/src/org/tukaani/xz/check/CRC32.java | 33 + Java/Tukaani/src/org/tukaani/xz/check/CRC64.java | 54 + Java/Tukaani/src/org/tukaani/xz/check/Check.java | 57 + Java/Tukaani/src/org/tukaani/xz/check/None.java | 24 + Java/Tukaani/src/org/tukaani/xz/check/SHA256.java | 30 + .../src/org/tukaani/xz/common/DecoderUtil.java | 121 + .../src/org/tukaani/xz/common/EncoderUtil.java | 36 + .../src/org/tukaani/xz/common/StreamFlags.java | 15 + Java/Tukaani/src/org/tukaani/xz/common/Util.java | 28 + .../src/org/tukaani/xz/delta/DeltaCoder.java | 27 + .../src/org/tukaani/xz/delta/DeltaDecoder.java | 24 + .../src/org/tukaani/xz/delta/DeltaEncoder.java | 24 + .../src/org/tukaani/xz/index/BlockInfo.java | 38 + .../src/org/tukaani/xz/index/IndexBase.java | 56 + .../src/org/tukaani/xz/index/IndexDecoder.java | 223 ++ .../src/org/tukaani/xz/index/IndexEncoder.java | 59 + .../src/org/tukaani/xz/index/IndexHash.java | 94 + .../src/org/tukaani/xz/index/IndexRecord.java | 20 + Java/Tukaani/src/org/tukaani/xz/lz/BT4.java | 255 ++ Java/Tukaani/src/org/tukaani/xz/lz/CRC32Hash.java | 35 + Java/Tukaani/src/org/tukaani/xz/lz/HC4.java | 200 ++ Java/Tukaani/src/org/tukaani/xz/lz/Hash234.java | 89 + Java/Tukaani/src/org/tukaani/xz/lz/LZDecoder.java | 126 + Java/Tukaani/src/org/tukaani/xz/lz/LZEncoder.java | 419 +++ Java/Tukaani/src/org/tukaani/xz/lz/Matches.java | 22 + .../Tukaani/src/org/tukaani/xz/lzma/LZMACoder.java | 140 + .../src/org/tukaani/xz/lzma/LZMADecoder.java | 199 ++ .../src/org/tukaani/xz/lzma/LZMAEncoder.java | 711 +++++ .../src/org/tukaani/xz/lzma/LZMAEncoderFast.java | 151 + .../src/org/tukaani/xz/lzma/LZMAEncoderNormal.java | 566 ++++ Java/Tukaani/src/org/tukaani/xz/lzma/Optimum.java | 73 + Java/Tukaani/src/org/tukaani/xz/lzma/State.java | 75 + Java/Tukaani/src/org/tukaani/xz/package-info.java | 36 + .../src/org/tukaani/xz/rangecoder/RangeCoder.java | 26 + .../org/tukaani/xz/rangecoder/RangeDecoder.java | 83 + .../xz/rangecoder/RangeDecoderFromBuffer.java | 64 + .../xz/rangecoder/RangeDecoderFromStream.java | 41 + .../org/tukaani/xz/rangecoder/RangeEncoder.java | 203 ++ Java/Tukaani/src/org/tukaani/xz/simple/ARM.java | 50 + .../src/org/tukaani/xz/simple/ARMThumb.java | 53 + Java/Tukaani/src/org/tukaani/xz/simple/IA64.java | 81 + .../Tukaani/src/org/tukaani/xz/simple/PowerPC.java | 50 + Java/Tukaani/src/org/tukaani/xz/simple/SPARC.java | 56 + .../src/org/tukaani/xz/simple/SimpleFilter.java | 14 + Java/Tukaani/src/org/tukaani/xz/simple/X86.java | 98 + NOTICE | 11 + lzma.txt | 598 ---- 737 files changed, 64038 insertions(+), 14743 deletions(-) e0f90d7 Set xz-java library to compile using current sdk for use by unbundled apps 1e977d7 Import org.tukaani ad6cd04 Import org.tukaani ea63289 Update the Android makefile to include most C files. cd66d54 Updated LZMA SDK to 9.38 beta. ========platform/external/mdnsresponder between android-6.0.1_r46..android-6.0.1_r54========= 0aa6558 Stop building __DATE__/__TIME__ into Android binaries ========platform/external/noto-fonts between android-6.0.1_r46..android-6.0.1_r54========= 42d158f Better compression for NotoColorEmoji b1a370c Update NotoColorEmoji font to Unicode 7 and 8 ========platform/external/okhttp between android-6.0.1_r46..android-6.0.1_r54========= 62dc0a1 DO NOT MERGE: Fix URLConnectionTest.writeTimeouts with large receive buffers 57813a7 Revert "DO NOT MERGE Revert "okio: increase segment size to 8 KiB"" 0051544 DO NOT MERGE Revert "okio: increase segment size to 8 KiB" ========platform/external/parameter-framework between android-6.0.1_r46..android-6.0.1_r54========= Android.mk | 13 +++++++++++++ parameter/Android.mk | 4 ++++ remote-process/Android.mk | 4 ++++ remote-processor/Android.mk | 4 ++++ test/test-platform/Android.mk | 4 ++++ utility/Android.mk | 4 ++++ xmlserializer/Android.mk | 4 ++++ 7 files changed, 37 insertions(+) 531c26b stlport library is needed for versions of Android before M ========platform/external/protobuf between android-6.0.1_r46..android-6.0.1_r54========= MODULE_LICENSE_APACHE2 | 0 NOTICE | 33 ++++++ java/pom.xml | 6 + .../protobuf/nano/CodedInputByteBufferNano.java | 14 +++ .../protobuf/nano/CodedOutputByteBufferNano.java | 61 ++++++++-- .../test/java/com/google/protobuf/NanoTest.java | 23 ++++ .../compiler/javanano/javanano_generator.cc | 12 ++ .../protobuf/compiler/javanano/javanano_params.h | 22 +++- .../compiler/javanano/javanano_primitive_field.cc | 86 +++++++++++--- .../compiler/javanano/javanano_primitive_field.h | 2 + src/google/protobuf/descriptor.pb.cc | 130 +++++++++++++-------- src/google/protobuf/descriptor.pb.h | 34 ++++++ src/google/protobuf/descriptor.proto | 3 + .../unittest_bytes_offset_length_nano.proto | 39 +++++++ 14 files changed, 390 insertions(+), 75 deletions(-) d2195e1 Update CodedOutputByteBufferNano to properly handle a malformed surrogate pair with a buffer too small to output a potentially well formed surrogate pair. This behavior mimics that of the ByteBuffer based methods. 6d7e42a Update thei Protocol Buffer descriptor.proto with the new javanano_use_deprecated_package FileOption. Regenerated the descriptor.pb.{c,h} based on the new proto file. 999188d Add MODULE_LICENSE and NOTICE 4a00786 Fixed Unused Parameter warning in headers. 4f87f0d Add a flag to use offset/length with byte arrays. b6872c8 Speed up little endian int/long writes. 5843810 Handle 0-length byte buffers in micro and nano protobufs ========platform/external/robolectric between android-6.0.1_r46..android-6.0.1_r54========= MODULE_LICENSE_MIT | 0 LICENSE.txt => NOTICE | 0 Android.mk => v1/Android.mk | 0 v1/LICENSE.txt | 21 ++++++++++ README.md => v1/README.md | 0 build.gradle => v1/build.gradle | 0 build.properties => v1/build.properties | 0 build.xml => v1/build.xml | 0 find-android.bat => v1/find-android.bat | 0 find-android.sh => v1/find-android.sh | 0 {lib => v1/lib}/main/android-support-v4.jar | Bin {lib => v1/lib}/main/android.jar | Bin {lib => v1/lib}/main/commons-codec-1.6.jar | Bin {lib => v1/lib}/main/commons-logging-1.1.1.jar | Bin {lib => v1/lib}/main/h2-1.2.147.jar | Bin {lib => v1/lib}/main/httpclient-4.0.3.jar | Bin {lib => v1/lib}/main/httpcore-4.0.1.jar | Bin {lib => v1/lib}/main/javassist-3.14.0-GA.jar | Bin {lib => v1/lib}/main/json-20080701.jar | Bin {lib => v1/lib}/main/maps_v16.jar | Bin .../lib}/main/opengl-api-gl1.1-android-2.1_r1.jar | Bin {lib => v1/lib}/main/sqlite-jdbc-3.7.2.jar | Bin {lib => v1/lib}/main/xpp3-1.1.4c.jar | Bin {lib => v1/lib}/test/mockito-core-1.8.5.jar | Bin pom.xml => v1/pom.xml | 0 {src => v1/src}/main/java/NOTICE | 0 .../java/android/content/TestIntentSender.java | 0 .../java/android/hardware/TestSensorManager.java | 0 .../main/java/android/net/Uri__FromAndroid.java | 0 .../java/android/os/ShadowAsyncTaskBridge.java | 0 .../main/java/android/os/ShadowBinderBridge.java | 0 .../src}/main/java/android/os/TestVibrator.java | 0 .../view/animation/ShadowAnimationBridge.java | 0 .../main/java/android/webkit/TestWebSettings.java | 0 {src => v1/src}/main/java/com/foo/Receiver.java | 0 .../android/maps/ShadowItemizedOverlayBridge.java | 0 .../java/com/xtremelabs/ConfigTestReceiver.java | 0 .../robolectric/ApplicationResolver.java | 0 .../com/xtremelabs/robolectric/Robolectric.java | 0 .../xtremelabs/robolectric/RobolectricConfig.java | 0 .../xtremelabs/robolectric/RobolectricConfigs.java | 0 .../xtremelabs/robolectric/RobolectricForMaps.java | 0 .../robolectric/RobolectricShadowOfLevel9.java | 0 .../robolectric/RobolectricTestRunner.java | 0 .../xtremelabs/robolectric/ShadowScrollView.java | 0 .../robolectric/annotation/DisableStrictI18n.java | 0 .../robolectric/annotation/EnableStrictI18n.java | 0 .../xtremelabs/robolectric/annotation/Values.java | 0 .../robolectric/bytecode/AndroidTranslator.java | 0 .../robolectric/bytecode/ClassCache.java | 0 .../robolectric/bytecode/ClassHandler.java | 0 .../bytecode/IgnorableClassNotFoundException.java | 0 .../bytecode/RobolectricClassLoader.java | 0 .../robolectric/bytecode/RobolectricInternals.java | 0 .../robolectric/bytecode/ShadowWrangler.java | 0 .../com/xtremelabs/robolectric/bytecode/Type.java | 0 .../robolectric/internal/AppSingletonizer.java | 0 .../robolectric/internal/ClassNameResolver.java | 0 .../robolectric/internal/DoNotInstrument.java | 0 .../robolectric/internal/EmptyRunnable.java | 0 .../robolectric/internal/Implementation.java | 0 .../robolectric/internal/Implements.java | 0 .../robolectric/internal/Instrument.java | 0 .../robolectric/internal/RealObject.java | 0 .../internal/RobolectricTestRunnerInterface.java | 0 .../matchers/CompoundButtonCheckedMatcher.java | 0 .../matchers/HasCompoundDrawablesMatcher.java | 0 .../robolectric/matchers/HasResourceMatcher.java | 0 .../matchers/ImageViewHasDrawableMatcher.java | 0 .../robolectric/matchers/StartedMatcher.java | 0 .../matchers/StartedServiceMatcher.java | 0 .../matchers/TextViewHasTextMatcher.java | 0 .../robolectric/matchers/ViewHasTextMatcher.java | 0 .../robolectric/res/AttrResourceLoader.java | 0 .../robolectric/res/ColorResourceLoader.java | 0 .../robolectric/res/DimenResourceLoader.java | 0 .../xtremelabs/robolectric/res/DocumentLoader.java | 0 .../robolectric/res/DrawableResourceLoader.java | 0 .../robolectric/res/IntegerResourceLoader.java | 0 .../com/xtremelabs/robolectric/res/MenuLoader.java | 0 .../robolectric/res/PluralResourceLoader.java | 0 .../robolectric/res/PreferenceLoader.java | 0 .../robolectric/res/RawResourceLoader.java | 0 .../robolectric/res/ResourceExtractor.java | 0 .../xtremelabs/robolectric/res/ResourceLoader.java | 0 .../robolectric/res/ResourceReferenceResolver.java | 0 .../robolectric/res/ResourceValueConverter.java | 0 .../robolectric/res/RobolectricPackageManager.java | 0 .../robolectric/res/StringArrayResourceLoader.java | 0 .../robolectric/res/StringResourceLoader.java | 0 .../com/xtremelabs/robolectric/res/ViewLoader.java | 0 .../robolectric/res/XTagXmlResourceLoader.java | 0 .../com/xtremelabs/robolectric/res/XmlLoader.java | 0 .../robolectric/res/XpathResourceXmlLoader.java | 0 .../robolectric/shadows/HttpResponseGenerator.java | 0 .../shadows/SerializedFragmentState.java | 0 .../robolectric/shadows/ShadowAbsListView.java | 0 .../robolectric/shadows/ShadowAbsSeekBar.java | 0 .../robolectric/shadows/ShadowAbsSpinner.java | 0 .../robolectric/shadows/ShadowAbsoluteLayout.java | 0 .../robolectric/shadows/ShadowAbstractCursor.java | 0 .../robolectric/shadows/ShadowAccount.java | 0 .../robolectric/shadows/ShadowAccountManager.java | 0 .../robolectric/shadows/ShadowActivity.java | 0 .../robolectric/shadows/ShadowActivityGroup.java | 0 .../robolectric/shadows/ShadowActivityInfo.java | 0 .../robolectric/shadows/ShadowActivityManager.java | 0 .../robolectric/shadows/ShadowAdapterView.java | 0 .../robolectric/shadows/ShadowAddress.java | 0 .../robolectric/shadows/ShadowAlarmManager.java | 0 .../robolectric/shadows/ShadowAlertDialog.java | 0 .../robolectric/shadows/ShadowAlphaAnimation.java | 0 .../shadows/ShadowAndroidHttpClient.java | 0 .../robolectric/shadows/ShadowAnimation.java | 0 .../shadows/ShadowAnimationDrawable.java | 0 .../robolectric/shadows/ShadowAnimationSet.java | 0 .../robolectric/shadows/ShadowAnimationUtils.java | 0 .../shadows/ShadowAppWidgetManager.java | 0 .../robolectric/shadows/ShadowApplication.java | 0 .../robolectric/shadows/ShadowArrayAdapter.java | 0 .../robolectric/shadows/ShadowAssetManager.java | 0 .../robolectric/shadows/ShadowAsyncTask.java | 0 .../robolectric/shadows/ShadowAudioManager.java | 0 .../shadows/ShadowAutoCompleteTextView.java | 0 .../robolectric/shadows/ShadowBase64.java | 0 .../robolectric/shadows/ShadowBaseAdapter.java | 0 .../robolectric/shadows/ShadowBinder.java | 0 .../robolectric/shadows/ShadowBitmap.java | 0 .../robolectric/shadows/ShadowBitmapDrawable.java | 0 .../robolectric/shadows/ShadowBitmapFactory.java | 0 .../shadows/ShadowBluetoothAdapter.java | 0 .../robolectric/shadows/ShadowBluetoothDevice.java | 0 .../robolectric/shadows/ShadowBundle.java | 0 .../robolectric/shadows/ShadowButton.java | 0 .../robolectric/shadows/ShadowCamera.java | 0 .../shadows/ShadowCameraParameters.java | 0 .../robolectric/shadows/ShadowCameraSize.java | 0 .../robolectric/shadows/ShadowCanvas.java | 0 .../robolectric/shadows/ShadowCheckedTextView.java | 0 .../shadows/ShadowClipboardManager.java | 0 .../robolectric/shadows/ShadowColor.java | 0 .../robolectric/shadows/ShadowColorDrawable.java | 0 .../robolectric/shadows/ShadowColorMatrix.java | 0 .../shadows/ShadowColorMatrixColorFilter.java | 0 .../robolectric/shadows/ShadowColorStateList.java | 0 .../robolectric/shadows/ShadowComponentName.java | 0 .../robolectric/shadows/ShadowCompoundButton.java | 0 .../robolectric/shadows/ShadowConfiguration.java | 0 .../shadows/ShadowConnectivityManager.java | 0 .../robolectric/shadows/ShadowContentProvider.java | 0 .../shadows/ShadowContentProviderOperation.java | 0 .../ShadowContentProviderOperationBuilder.java | 0 .../shadows/ShadowContentProviderResult.java | 0 .../robolectric/shadows/ShadowContentResolver.java | 0 .../robolectric/shadows/ShadowContentUris.java | 0 .../robolectric/shadows/ShadowContentValues.java | 0 .../robolectric/shadows/ShadowContext.java | 0 .../shadows/ShadowContextThemeWrapper.java | 0 .../robolectric/shadows/ShadowContextWrapper.java | 0 .../robolectric/shadows/ShadowCookieManager.java | 0 .../shadows/ShadowCookieSyncManager.java | 0 .../robolectric/shadows/ShadowCountDownTimer.java | 0 .../robolectric/shadows/ShadowCriteria.java | 0 .../robolectric/shadows/ShadowCursorAdapter.java | 0 .../robolectric/shadows/ShadowCursorLoader.java | 0 .../robolectric/shadows/ShadowCursorWrapper.java | 0 .../robolectric/shadows/ShadowDatabaseUtils.java | 0 .../robolectric/shadows/ShadowDateFormat.java | 0 .../shadows/ShadowDefaultRequestDirector.java | 0 .../robolectric/shadows/ShadowDialog.java | 0 .../robolectric/shadows/ShadowDialogFragment.java | 0 .../shadows/ShadowDialogPreference.java | 0 .../robolectric/shadows/ShadowDisplay.java | 0 .../robolectric/shadows/ShadowDrawable.java | 0 .../robolectric/shadows/ShadowEditText.java | 0 .../robolectric/shadows/ShadowEnvironment.java | 0 .../shadows/ShadowExpandableListView.java | 0 .../robolectric/shadows/ShadowFilter.java | 0 .../robolectric/shadows/ShadowFloatMath.java | 0 .../robolectric/shadows/ShadowFragment.java | 0 .../shadows/ShadowFragmentActivity.java | 0 .../shadows/ShadowFragmentPagerAdapter.java | 0 .../robolectric/shadows/ShadowFrameLayout.java | 0 .../robolectric/shadows/ShadowGallery.java | 0 .../robolectric/shadows/ShadowGeoPoint.java | 0 .../robolectric/shadows/ShadowGeocoder.java | 0 .../robolectric/shadows/ShadowGridView.java | 0 .../robolectric/shadows/ShadowHandler.java | 0 .../robolectric/shadows/ShadowHandlerThread.java | 0 .../xtremelabs/robolectric/shadows/ShadowHtml.java | 0 .../robolectric/shadows/ShadowImageView.java | 0 .../shadows/ShadowInputMethodManager.java | 0 .../robolectric/shadows/ShadowIntent.java | 0 .../robolectric/shadows/ShadowIntentFilter.java | 0 .../shadows/ShadowIntentFilterAuthorityEntry.java | 0 .../robolectric/shadows/ShadowItemizedOverlay.java | 0 .../robolectric/shadows/ShadowJsPromptResult.java | 0 .../robolectric/shadows/ShadowJsResult.java | 0 .../robolectric/shadows/ShadowKeyEvent.java | 0 .../robolectric/shadows/ShadowKeyGuardLock.java | 0 .../robolectric/shadows/ShadowKeyguardManager.java | 0 .../robolectric/shadows/ShadowLayerDrawable.java | 0 .../robolectric/shadows/ShadowLayoutInflater.java | 0 .../robolectric/shadows/ShadowLayoutParams.java | 0 .../robolectric/shadows/ShadowLinearLayout.java | 0 .../shadows/ShadowLinkMovementMethod.java | 0 .../robolectric/shadows/ShadowListActivity.java | 0 .../robolectric/shadows/ShadowListFragment.java | 0 .../robolectric/shadows/ShadowListPreference.java | 0 .../robolectric/shadows/ShadowListView.java | 0 .../shadows/ShadowLocalBroadcastManager.java | 0 .../robolectric/shadows/ShadowLocation.java | 0 .../robolectric/shadows/ShadowLocationManager.java | 0 .../xtremelabs/robolectric/shadows/ShadowLog.java | 0 .../robolectric/shadows/ShadowLooper.java | 0 .../robolectric/shadows/ShadowMapActivity.java | 0 .../robolectric/shadows/ShadowMapController.java | 0 .../robolectric/shadows/ShadowMapView.java | 0 .../shadows/ShadowMarginLayoutParams.java | 0 .../robolectric/shadows/ShadowMatrix.java | 0 .../robolectric/shadows/ShadowMatrixCursor.java | 0 .../robolectric/shadows/ShadowMediaPlayer.java | 0 .../robolectric/shadows/ShadowMediaRecorder.java | 0 .../robolectric/shadows/ShadowMediaStore.java | 0 .../robolectric/shadows/ShadowMenuInflater.java | 0 .../robolectric/shadows/ShadowMessage.java | 0 .../robolectric/shadows/ShadowMessenger.java | 0 .../robolectric/shadows/ShadowMimeTypeMap.java | 0 .../robolectric/shadows/ShadowMotionEvent.java | 0 .../robolectric/shadows/ShadowNdefMessage.java | 0 .../robolectric/shadows/ShadowNdefRecord.java | 0 .../robolectric/shadows/ShadowNetworkInfo.java | 0 .../robolectric/shadows/ShadowNfcAdapter.java | 0 .../robolectric/shadows/ShadowNotification.java | 0 .../shadows/ShadowNotificationManager.java | 0 .../robolectric/shadows/ShadowOverlayItem.java | 0 .../robolectric/shadows/ShadowPagerAdapter.java | 0 .../robolectric/shadows/ShadowPaint.java | 0 .../xtremelabs/robolectric/shadows/ShadowPair.java | 0 .../robolectric/shadows/ShadowParcel.java | 0 .../ShadowPasswordTransformationMethod.java | 0 .../xtremelabs/robolectric/shadows/ShadowPath.java | 0 .../robolectric/shadows/ShadowPatterns.java | 0 .../robolectric/shadows/ShadowPendingIntent.java | 0 .../robolectric/shadows/ShadowPeriodicSync.java | 0 .../shadows/ShadowPhoneNumberUtils.java | 0 .../robolectric/shadows/ShadowPoint.java | 0 .../robolectric/shadows/ShadowPointF.java | 0 .../robolectric/shadows/ShadowPopupWindow.java | 0 .../robolectric/shadows/ShadowPowerManager.java | 0 .../robolectric/shadows/ShadowPreference.java | 0 .../shadows/ShadowPreferenceActivity.java | 0 .../shadows/ShadowPreferenceCategory.java | 0 .../robolectric/shadows/ShadowPreferenceGroup.java | 0 .../shadows/ShadowPreferenceManager.java | 0 .../shadows/ShadowPreferenceScreen.java | 0 .../robolectric/shadows/ShadowProcess.java | 0 .../robolectric/shadows/ShadowProgressBar.java | 0 .../robolectric/shadows/ShadowProgressDialog.java | 0 .../robolectric/shadows/ShadowRadioButton.java | 0 .../robolectric/shadows/ShadowRadioGroup.java | 0 .../robolectric/shadows/ShadowRatingBar.java | 0 .../xtremelabs/robolectric/shadows/ShadowRect.java | 0 .../shadows/ShadowRemoteCallbackList.java | 0 .../robolectric/shadows/ShadowRemoteViews.java | 0 .../robolectric/shadows/ShadowResolveInfo.java | 0 .../shadows/ShadowResourceCursorAdapter.java | 0 .../robolectric/shadows/ShadowResources.java | 0 .../robolectric/shadows/ShadowResultReceiver.java | 0 .../robolectric/shadows/ShadowSQLiteCloseable.java | 0 .../robolectric/shadows/ShadowSQLiteCursor.java | 0 .../robolectric/shadows/ShadowSQLiteDatabase.java | 0 .../shadows/ShadowSQLiteOpenHelper.java | 0 .../robolectric/shadows/ShadowSQLiteProgram.java | 0 .../shadows/ShadowSQLiteQueryBuilder.java | 0 .../robolectric/shadows/ShadowSQLiteStatement.java | 0 .../shadows/ShadowSSLCertificateSocketFactory.java | 0 .../robolectric/shadows/ShadowScanResult.java | 0 .../robolectric/shadows/ShadowSeekBar.java | 0 .../robolectric/shadows/ShadowSensorManager.java | 0 .../robolectric/shadows/ShadowService.java | 0 .../robolectric/shadows/ShadowSettings.java | 0 .../robolectric/shadows/ShadowShapeDrawable.java | 0 .../robolectric/shadows/ShadowSignature.java | 0 .../shadows/ShadowSimpleCursorAdapter.java | 0 .../robolectric/shadows/ShadowSmsManager.java | 0 .../robolectric/shadows/ShadowSpannableString.java | 0 .../shadows/ShadowSpannableStringBuilder.java | 0 .../robolectric/shadows/ShadowSparseArray.java | 0 .../shadows/ShadowSparseBooleanArray.java | 0 .../robolectric/shadows/ShadowSparseIntArray.java | 0 .../robolectric/shadows/ShadowSpinner.java | 0 .../robolectric/shadows/ShadowSslErrorHandler.java | 0 .../robolectric/shadows/ShadowStatFs.java | 0 .../shadows/ShadowStateListDrawable.java | 0 .../robolectric/shadows/ShadowSurfaceView.java | 0 .../robolectric/shadows/ShadowSyncResult.java | 0 .../robolectric/shadows/ShadowTabActivity.java | 0 .../robolectric/shadows/ShadowTabHost.java | 0 .../robolectric/shadows/ShadowTabSpec.java | 0 .../shadows/ShadowTelephonyManager.java | 0 .../robolectric/shadows/ShadowTextPaint.java | 0 .../robolectric/shadows/ShadowTextUtils.java | 0 .../robolectric/shadows/ShadowTextView.java | 0 .../xtremelabs/robolectric/shadows/ShadowTime.java | 0 .../robolectric/shadows/ShadowToast.java | 0 .../shadows/ShadowTranslateAnimation.java | 0 .../robolectric/shadows/ShadowTypedArray.java | 0 .../robolectric/shadows/ShadowTypedValue.java | 0 .../robolectric/shadows/ShadowURLSpan.java | 0 .../robolectric/shadows/ShadowUriMatcher.java | 0 .../robolectric/shadows/ShadowVibrator.java | 0 .../robolectric/shadows/ShadowVideoView.java | 0 .../xtremelabs/robolectric/shadows/ShadowView.java | 0 .../robolectric/shadows/ShadowViewAnimator.java | 0 .../shadows/ShadowViewConfiguration.java | 0 .../robolectric/shadows/ShadowViewFlipper.java | 0 .../robolectric/shadows/ShadowViewGroup.java | 0 .../robolectric/shadows/ShadowViewMeasureSpec.java | 0 .../robolectric/shadows/ShadowViewPager.java | 0 .../robolectric/shadows/ShadowViewStub.java | 0 .../shadows/ShadowViewTreeObserver.java | 0 .../robolectric/shadows/ShadowWebView.java | 0 .../shadows/ShadowWifiConfiguration.java | 0 .../robolectric/shadows/ShadowWifiInfo.java | 0 .../robolectric/shadows/ShadowWifiManager.java | 0 .../robolectric/shadows/ShadowWindow.java | 0 .../shadows/ShadowZoomButtonsController.java | 0 .../robolectric/shadows/StatusLineStub.java | 0 .../xtremelabs/robolectric/shadows/package.html | 0 .../robolectric/test/ConfigTestReceiver.java | 0 .../android/content/TestSharedPreferences.java | 0 .../android/content/pm/StubPackageManager.java | 0 .../tester/android/database/SimpleTestCursor.java | 0 .../tester/android/database/TestCursor.java | 0 .../tester/android/text/TestClipboardManager.java | 0 .../tester/android/util/TestAttributeSet.java | 0 .../tester/android/util/TestFragmentManager.java | 0 .../android/util/TestFragmentTransaction.java | 0 .../robolectric/tester/android/view/TestMenu.java | 0 .../tester/android/view/TestMenuItem.java | 0 .../tester/android/view/TestSubMenu.java | 0 .../tester/android/view/TestWindow.java | 0 .../tester/android/view/TestWindowManager.java | 0 .../tester/org/apache/http/FakeHttpLayer.java | 0 .../tester/org/apache/http/HttpEntityStub.java | 0 .../tester/org/apache/http/HttpRequestInfo.java | 0 .../tester/org/apache/http/HttpResponseStub.java | 0 .../tester/org/apache/http/ParamsParser.java | 0 .../tester/org/apache/http/RequestMatcher.java | 0 .../tester/org/apache/http/TestHttpResponse.java | 0 .../http/impl/client/DefaultRequestDirector.java | 0 .../org/apache/http/impl/client/HttpRedirect.java | 0 .../robolectric/util/DatabaseConfig.java | 0 .../com/xtremelabs/robolectric/util/H2Map.java | 0 .../robolectric/util/H2Map_TypeForwardOnly.java | 0 .../xtremelabs/robolectric/util/I18nException.java | 0 .../java/com/xtremelabs/robolectric/util/Join.java | 0 .../robolectric/util/PropertiesHelper.java | 0 .../util/RobolectricBackgroundExecutorService.java | 0 .../com/xtremelabs/robolectric/util/SQLite.java | 0 .../com/xtremelabs/robolectric/util/SQLiteMap.java | 0 .../com/xtremelabs/robolectric/util/Scheduler.java | 0 .../com/xtremelabs/robolectric/util/Strings.java | 0 .../xtremelabs/robolectric/util/Transcript.java | 0 {src => v1/src}/main/java/overview.html | 0 .../java/android/webkit/TestWebSettingsTest.java | 0 .../robolectric/ApplicationResolverTest.java | 0 .../robolectric/DotConfigTestReceiver.java | 0 .../robolectric/IncludedDependenciesTest.java | 0 .../robolectric/InstrumentDetectorTest.java | 0 .../test/java/com/xtremelabs/robolectric/R.java | 0 .../robolectric/RobolectricConfigTest.java | 0 .../xtremelabs/robolectric/RobolectricTest.java | 0 .../RobolectricTestRunnerClassLoaderSetup.java | 0 .../robolectric/RobolectricTestRunnerTest.java | 0 .../robolectric/TemporaryBindingsTest.java | 0 .../xtremelabs/robolectric/TestApplication.java | 0 .../robolectric/WithCustomClassListTestRunner.java | 0 .../robolectric/WithTestDefaultsRunner.java | 0 .../robolectric/WithoutTestDefaultsRunner.java | 0 .../AndroidTranslatorClassIntrumentedTest.java | 0 .../bytecode/AndroidTranslatorTest.java | 0 .../bytecode/AndroidTranslatorUnitTest.java | 0 .../robolectric/bytecode/ClassCacheTest.java | 0 .../bytecode/CustomRobolectricTestRunnerTest.java | 0 .../com/xtremelabs/robolectric/bytecode/Foo.java | 0 .../bytecode/RobolectricWiringTest.java | 0 .../xtremelabs/robolectric/bytecode/ShadowFoo.java | 0 .../robolectric/bytecode/ShadowWranglerTest.java | 0 .../internal/ClassNameResolverTest.java | 0 .../robolectric/matchers/StartedMatcherTest.java | 0 .../matchers/StartedServiceMatcherTest.java | 0 .../robolectric/res/AttrResourceLoaderTest.java | 0 .../robolectric/res/ColorResourceLoaderTest.java | 0 .../robolectric/res/DimenResourceLoaderTest.java | 0 .../res/DrawableResourceLoaderTest.java | 0 .../robolectric/res/IntegerResourceLoaderTest.java | 0 .../xtremelabs/robolectric/res/MenuLoaderTest.java | 0 .../robolectric/res/MenuResourceLoaderTest.java | 0 .../robolectric/res/PluralResourceLoaderTest.java | 0 .../robolectric/res/PreferenceLoaderTest.java | 0 .../robolectric/res/RawResourceLoaderTest.java | 0 .../robolectric/res/ResourceExtractorTest.java | 0 .../robolectric/res/ResourceLoaderTest.java | 0 .../res/RobolectricPackageManagerTest.java | 0 .../res/StringArrayResourceLoaderTest.java | 0 .../robolectric/res/StringResourceLoaderTest.java | 0 .../robolectric/res/TestAttributeSetTest.java | 0 .../xtremelabs/robolectric/res/ViewLoaderTest.java | 0 .../robolectric/shadows/AbsSeekBarTest.java | 0 .../robolectric/shadows/AbsSpinnerTest.java | 0 .../robolectric/shadows/AbstractCursorTest.java | 0 .../robolectric/shadows/AccountManagerTest.java | 0 .../robolectric/shadows/AccountTest.java | 0 .../robolectric/shadows/ActivityGroupTest.java | 0 .../robolectric/shadows/ActivityManagerTest.java | 0 .../robolectric/shadows/ActivityTest.java | 0 .../robolectric/shadows/AdapterViewBehavior.java | 0 .../robolectric/shadows/AlarmManagerTest.java | 0 .../robolectric/shadows/AlertDialogTest.java | 0 .../robolectric/shadows/AlphaAnimationTest.java | 0 .../robolectric/shadows/AndroidHttpClientTest.java | 0 .../robolectric/shadows/AnimationSetTest.java | 0 .../robolectric/shadows/AnimationTest.java | 0 .../robolectric/shadows/AnimationUtilsTest.java | 0 .../robolectric/shadows/AppWidgetManagerTest.java | 0 .../robolectric/shadows/ApplicationTest.java | 0 .../robolectric/shadows/ArrayAdapterTest.java | 0 .../robolectric/shadows/AssetManagerTest.java | 0 .../robolectric/shadows/AsyncTaskTest.java | 0 .../robolectric/shadows/AudioManagerTest.java | 0 .../xtremelabs/robolectric/shadows/Base64Test.java | 0 .../robolectric/shadows/BaseAdapterTest.java | 0 .../xtremelabs/robolectric/shadows/BinderTest.java | 0 .../robolectric/shadows/BitmapDrawableTest.java | 0 .../robolectric/shadows/BitmapFactoryTest.java | 0 .../xtremelabs/robolectric/shadows/BitmapTest.java | 0 .../xtremelabs/robolectric/shadows/BundleTest.java | 0 .../robolectric/shadows/CameraParametersTest.java | 0 .../robolectric/shadows/CameraSizeTest.java | 0 .../xtremelabs/robolectric/shadows/CameraTest.java | 0 .../xtremelabs/robolectric/shadows/CanvasTest.java | 0 .../robolectric/shadows/CheckBoxTest.java | 0 .../robolectric/shadows/CheckedTextViewTest.java | 0 .../robolectric/shadows/ClipboardManagerTest.java | 0 .../xtremelabs/robolectric/shadows/ColorTest.java | 0 .../robolectric/shadows/ConfigurationTest.java | 0 .../shadows/ConnectivityManagerTest.java | 0 .../ContentProviderOperationBuilderTest.java | 0 .../shadows/ContentProviderOperationTest.java | 0 .../shadows/ContentProviderResultTest.java | 0 .../robolectric/shadows/ContentProviderTest.java | 0 .../robolectric/shadows/ContentResolverTest.java | 0 .../robolectric/shadows/ContentUrisTest.java | 0 .../robolectric/shadows/ContextTest.java | 0 .../robolectric/shadows/ContextWrapperTest.java | 0 .../robolectric/shadows/CookieManagerTest.java | 0 .../robolectric/shadows/CookieSyncManagerTest.java | 0 .../robolectric/shadows/CountDownTimerTest.java | 0 .../robolectric/shadows/CountingAdapter.java | 0 .../robolectric/shadows/CriteriaTest.java | 0 .../robolectric/shadows/CursorAdapterTest.java | 0 .../robolectric/shadows/CursorLoaderTest.java | 0 .../robolectric/shadows/CursorWrapperTest.java | 0 .../robolectric/shadows/DatabaseTestBase.java | 0 .../robolectric/shadows/DatabaseUtilsTest.java | 0 .../shadows/DefaultRequestDirectorTest.java | 0 .../robolectric/shadows/DialogFragmentTest.java | 0 .../robolectric/shadows/DialogPreferenceTest.java | 0 .../xtremelabs/robolectric/shadows/DialogTest.java | 0 .../robolectric/shadows/DisplayTest.java | 0 .../robolectric/shadows/DrawableTest.java | 0 .../robolectric/shadows/EditTextTest.java | 0 .../robolectric/shadows/EnvironmentTest.java | 0 .../shadows/ExpandableListViewTest.java | 0 .../robolectric/shadows/FragmentActivityTest.java | 0 .../robolectric/shadows/FragmentManagerTest.java | 0 .../robolectric/shadows/FragmentTest.java | 0 .../shadows/FragmentTransactionTest.java | 0 .../robolectric/shadows/FrameLayoutTest.java | 0 .../robolectric/shadows/GalleryTest.java | 0 .../robolectric/shadows/GeocoderTest.java | 0 .../robolectric/shadows/H2DatabaseTest.java | 0 .../robolectric/shadows/HandlerTest.java | 0 .../robolectric/shadows/HandlerThreadTest.java | 0 .../xtremelabs/robolectric/shadows/HtmlTest.java | 0 .../robolectric/shadows/ImageViewTest.java | 0 .../shadows/InputMethodManagerTest.java | 0 .../shadows/IntentFilterAuthorityEntryTest.java | 0 .../robolectric/shadows/IntentFilterTest.java | 0 .../xtremelabs/robolectric/shadows/IntentTest.java | 0 .../robolectric/shadows/ItemizedOverlayTest.java | 0 .../robolectric/shadows/JsPromptResultTest.java | 0 .../robolectric/shadows/JsResultTest.java | 0 .../robolectric/shadows/KeyguardManagerTest.java | 0 .../robolectric/shadows/LayerDrawableTest.java | 0 .../robolectric/shadows/LayoutInflaterTest.java | 0 .../robolectric/shadows/LayoutParamsTest.java | 0 .../robolectric/shadows/LinearLayoutTest.java | 0 .../shadows/LinkMovementMethodTest.java | 0 .../robolectric/shadows/ListActivityTest.java | 0 .../robolectric/shadows/ListFragmentTest.java | 0 .../robolectric/shadows/ListPreferenceTest.java | 0 .../robolectric/shadows/ListViewTest.java | 0 .../shadows/LocalBroadcastManagerTest.java | 0 .../robolectric/shadows/LocationManagerTest.java | 0 .../robolectric/shadows/LocationTest.java | 0 .../xtremelabs/robolectric/shadows/LogTest.java | 0 .../xtremelabs/robolectric/shadows/LooperTest.java | 0 .../robolectric/shadows/MapActivityTest.java | 0 .../robolectric/shadows/MapViewTest.java | 0 .../shadows/MarginLayoutParamsTest.java | 0 .../robolectric/shadows/MatrixCursorTest.java | 0 .../robolectric/shadows/MediaPlayerTest.java | 0 .../robolectric/shadows/MediaRecorderTest.java | 0 .../robolectric/shadows/MediaStoreTest.java | 0 .../robolectric/shadows/MenuInflaterTest.java | 0 .../robolectric/shadows/MessageTest.java | 0 .../robolectric/shadows/MessengerTest.java | 0 .../robolectric/shadows/MimeTypeMapTest.java | 0 .../robolectric/shadows/MotionEventTest.java | 0 .../robolectric/shadows/NdefMessageTest.java | 0 .../robolectric/shadows/NdefRecordTest.java | 0 .../robolectric/shadows/NetworkInfoTest.java | 0 .../robolectric/shadows/NfcAdapterTest.java | 0 .../shadows/NotificationManagerTest.java | 0 .../robolectric/shadows/NotificationTest.java | 0 .../robolectric/shadows/PagerAdapterTest.java | 0 .../xtremelabs/robolectric/shadows/PaintTest.java | 0 .../xtremelabs/robolectric/shadows/PairTest.java | 0 .../xtremelabs/robolectric/shadows/ParcelTest.java | 0 .../shadows/PasswordTransformationMethodTest.java | 0 .../xtremelabs/robolectric/shadows/PathTest.java | 0 .../robolectric/shadows/PendingIntentTest.java | 0 .../robolectric/shadows/PeriodicSyncTest.java | 0 .../robolectric/shadows/PhoneNumberUtilTest.java | 0 .../robolectric/shadows/PopupWindowTest.java | 0 .../robolectric/shadows/PowerManagerTest.java | 0 .../shadows/PreferenceActivityTest.java | 0 .../shadows/PreferenceCategoryTest.java | 0 .../robolectric/shadows/PreferenceGroupTest.java | 0 .../robolectric/shadows/PreferenceManagerTest.java | 0 .../robolectric/shadows/PreferenceScreenTest.java | 0 .../robolectric/shadows/PreferenceTest.java | 0 .../robolectric/shadows/ProcessTest.java | 0 .../robolectric/shadows/ProgressBarTest.java | 0 .../robolectric/shadows/ProgressDialogTest.java | 0 .../robolectric/shadows/RadioButtonTest.java | 0 .../robolectric/shadows/RadioGroupTest.java | 0 .../robolectric/shadows/RatingBarTest.java | 0 .../xtremelabs/robolectric/shadows/RectTest.java | 0 .../shadows/RemoteCallbackListTest.java | 0 .../robolectric/shadows/ResolveInfoTest.java | 0 .../robolectric/shadows/ResourcesTest.java | 0 .../robolectric/shadows/ResultReceiverTest.java | 0 .../robolectric/shadows/SQLiteCursorTest.java | 0 .../robolectric/shadows/SQLiteDatabaseTest.java | 0 .../robolectric/shadows/SQLiteOpenHelperTest.java | 0 .../shadows/SQLiteQueryBuilderTest.java | 0 .../robolectric/shadows/SQLiteStatementTest.java | 0 .../robolectric/shadows/ScanResultTest.java | 0 .../robolectric/shadows/ScrollViewTest.java | 0 .../robolectric/shadows/SeekBarTest.java | 0 .../robolectric/shadows/SensorManagerTest.java | 0 .../robolectric/shadows/ServiceTest.java | 0 .../robolectric/shadows/SettingsTest.java | 0 .../shadows/ShadowAutoCompleteTextViewTest.java | 0 .../robolectric/shadows/ShadowBinderTest.java | 0 .../robolectric/shadows/ShadowEditTextTest.java | 0 .../robolectric/shadows/ShapeDrawableTest.java | 0 .../robolectric/shadows/SignatureTest.java | 0 .../robolectric/shadows/SmsManagerTest.java | 0 .../shadows/SpannableStringBuilderTest.java | 0 .../robolectric/shadows/SpannableStringTest.java | 0 .../robolectric/shadows/SparseArrayTest.java | 0 .../robolectric/shadows/SpinnerTest.java | 0 .../robolectric/shadows/SslErrorHandlerTest.java | 0 .../xtremelabs/robolectric/shadows/StatFsTest.java | 0 .../robolectric/shadows/StateListDrawableTest.java | 0 .../robolectric/shadows/SyncResultTest.java | 0 .../robolectric/shadows/TabActivityTest.java | 0 .../robolectric/shadows/TabHostTest.java | 0 .../robolectric/shadows/TabSpecTest.java | 0 .../robolectric/shadows/TelephonyManagerTest.java | 0 .../robolectric/shadows/TestFragment.java | 0 .../robolectric/shadows/TestParcelable.java | 0 .../robolectric/shadows/TestService.java | 0 .../robolectric/shadows/TextPaintTest.java | 0 .../robolectric/shadows/TextUtilsTest.java | 0 .../robolectric/shadows/TextViewTest.java | 0 .../xtremelabs/robolectric/shadows/TimeTest.java | 0 .../xtremelabs/robolectric/shadows/ToastTest.java | 0 .../shadows/TranslateAnimationTest.java | 0 .../robolectric/shadows/TypedArrayTest.java | 0 .../robolectric/shadows/TypedValueTest.java | 0 .../robolectric/shadows/UriMatcherTest.java | 0 .../xtremelabs/robolectric/shadows/UriTest.java | 0 .../robolectric/shadows/VibratorTest.java | 0 .../robolectric/shadows/VideoViewTest.java | 0 .../robolectric/shadows/ViewAnimatorTest.java | 0 .../robolectric/shadows/ViewConfigurationTest.java | 0 .../robolectric/shadows/ViewFlipperTest.java | 0 .../robolectric/shadows/ViewGroupTest.java | 0 .../robolectric/shadows/ViewInnerTextTest.java | 0 .../robolectric/shadows/ViewMeasureSpecTest.java | 0 .../robolectric/shadows/ViewPagerTest.java | 0 .../robolectric/shadows/ViewStubTest.java | 0 .../xtremelabs/robolectric/shadows/ViewTest.java | 0 .../robolectric/shadows/ViewTreeObserverTest.java | 0 .../robolectric/shadows/WebViewTest.java | 0 .../robolectric/shadows/WifiConfigurationTest.java | 0 .../robolectric/shadows/WifiInfoTest.java | 0 .../robolectric/shadows/WifiManagerTest.java | 0 .../android/content/TestSharedPreferencesTest.java | 0 .../android/database/SimpleTestCursorTest.java | 0 .../tester/android/view/TestMenuTest.java | 0 .../tester/android/view/TestWindowTest.java | 0 .../tester/org/apache/http/FakeHttpLayerTest.java | 0 .../tester/org/apache/http/ParamsParserTest.java | 0 .../org/apache/http/TestHttpResponseTest.java | 0 .../xtremelabs/robolectric/util/CustomView.java | 0 .../xtremelabs/robolectric/util/CustomView2.java | 0 .../robolectric/util/DatabaseConfigTest.java | 0 .../com/xtremelabs/robolectric/util/H2MapTest.java | 0 .../util/H2Map_TypeForwardOnlyTest.java | 0 .../com/xtremelabs/robolectric/util/H2Test.java | 0 .../robolectric/util/NullDatabaseMap.java | 0 .../robolectric/util/NullDatabaseMapTest.java | 0 .../robolectric/util/PropertiesHelperTest.java | 0 .../RobolectricBackgroundExecutorServiceTest.java | 0 .../robolectric/util/SQLiteTestHelper.java | 0 .../xtremelabs/robolectric/util/SQLite_Test.java | 0 .../xtremelabs/robolectric/util/SchedulerTest.java | 0 .../xtremelabs/robolectric/util/StringsTest.java | 0 .../robolectric/util/TestAnimationListener.java | 0 .../robolectric/util/TestBroadcastReceiver.java | 0 .../robolectric/util/TestOnClickListener.java | 0 .../robolectric/util/TestOnLongClickListener.java | 0 .../com/xtremelabs/robolectric/util/TestR.java | 0 .../xtremelabs/robolectric/util/TestRunnable.java | 0 .../com/xtremelabs/robolectric/util/TestUtil.java | 0 .../src}/test/resources/TestAndroidManifest.xml | 0 .../resources/TestAndroidManifestWithAppName.xml | 0 .../TestAndroidManifestWithBadAppName.xml | 0 .../resources/TestAndroidManifestWithFlags.xml | 0 .../TestAndroidManifestWithMinSdkVersionOnly.xml | 0 .../resources/TestAndroidManifestWithNoProcess.xml | 0 .../TestAndroidManifestWithPackageName.xml | 0 .../resources/TestAndroidManifestWithProcess.xml | 0 .../resources/TestAndroidManifestWithReceivers.xml | 0 .../TestAndroidManifestWithSdkVersion.xml | 0 .../src}/test/resources/assets/assetsHome.txt | 0 .../resources/assets/docs/extra/testing/hello.txt | 0 .../test/resources/res/drawable/animation_list.xml | 0 .../src}/test/resources/res/drawable/l0_red.png | Bin .../src}/test/resources/res/drawable/l1_orange.png | Bin .../src}/test/resources/res/drawable/l2_yellow.png | Bin .../src}/test/resources/res/drawable/l3_green.png | Bin .../src}/test/resources/res/drawable/l4_blue.png | Bin .../src}/test/resources/res/drawable/l5_indigo.png | Bin .../src}/test/resources/res/drawable/l6_violet.png | Bin .../src}/test/resources/res/drawable/l7_white.png | Bin .../res/drawable/nine_patch_drawable.9.png | Bin .../src}/test/resources/res/drawable/rainbow.xml | 0 .../test/resources/res/drawable/state_drawable.xml | 0 .../res/layout-land/different_screen_sizes.xml | 0 .../layout-large-v16/different_screen_sizes.xml | 0 .../res/layout-v11/different_screen_sizes.xml | 0 .../layout-xlarge-v11/different_screen_sizes.xml | 0 .../res/layout-xlarge/different_screen_sizes.xml | 0 .../res/layout/.bogus_hidden_dir_for_tests/bad.xml | 0 .../resources/res/layout/activity_list_item.xml | 0 .../test/resources/res/layout/custom_layout.xml | 0 .../test/resources/res/layout/custom_layout2.xml | 0 .../res/layout/different_screen_sizes.xml | 0 .../resources/res/layout/fragment_activity.xml | 0 .../res/layout/included_layout_parent.xml | 0 .../res/layout/included_linear_layout.xml | 0 .../src}/test/resources/res/layout/inner_merge.xml | 0 {src => v1/src}/test/resources/res/layout/main.xml | 0 .../src}/test/resources/res/layout/mapview.xml | 0 .../src}/test/resources/res/layout/media.xml | 0 .../src}/test/resources/res/layout/outer.xml | 0 .../test/resources/res/layout/override_include.xml | 0 .../test/resources/res/layout/request_focus.xml | 0 .../layout/request_focus_with_two_edit_texts.xml | 0 .../src}/test/resources/res/layout/snippet.xml | 0 .../test/resources/res/layout/tab_activity.xml | 0 .../src}/test/resources/res/layout/text_views.xml | 0 .../test/resources/res/layout/text_views_hints.xml | 0 .../test/resources/res/layout/toplevel_merge.xml | 0 .../src}/test/resources/res/layout/views.xml | 0 .../test/resources/res/layout/webview_holder.xml | 0 .../resources/res/layout/with_invalid_onclick.xml | 0 {src => v1/src}/test/resources/res/menu/test.xml | 0 .../test/resources/res/menu/test_withchilds.xml | 0 {src => v1/src}/test/resources/res/raw/raw_no_ext | 0 .../src}/test/resources/res/raw/raw_resource.txt | 0 .../src}/test/resources/res/values-fr/strings.xml | 0 .../src}/test/resources/res/values/attrs.xml | 0 .../src}/test/resources/res/values/colors.xml | 0 .../src}/test/resources/res/values/dimens.xml | 0 .../src}/test/resources/res/values/integer.xml | 0 .../src}/test/resources/res/values/plurals.xml | 0 .../test/resources/res/values/string_arrays.xml | 0 .../src}/test/resources/res/values/strings.xml | 0 .../src}/test/resources/res/xml/preferences.xml | 0 update-downloads.rb => v1/update-downloads.rb | 0 v3/LICENSE.txt | 23 +++++++++++ v3/README.txt | 44 +++++++++++++++++++++ v3/build.gradle | 40 +++++++++++++++++++ v3/libs/README.txt | 11 ++++++ v3/libs/sqlite4java-0.282.jar | Bin 0 -> 129381 bytes v3/libs/vtd-xml-2.11.jar | Bin 0 -> 637560 bytes v3/robolectric-3.1-SNAPSHOT.jar | Bin 0 -> 174071 bytes v3/robolectric-annotations-3.1-SNAPSHOT.jar | Bin 0 -> 10647 bytes v3/robolectric-processor-3.1-SNAPSHOT.jar | Bin 0 -> 41844 bytes v3/robolectric-resources-3.1-SNAPSHOT.jar | Bin 0 -> 152064 bytes v3/robolectric-utils-3.1-SNAPSHOT.jar | Bin 0 -> 40476 bytes v3/runtime/android-all-4.1.2_r1-robolectric-0.jar | Bin 0 -> 31438553 bytes .../android-all-4.2.2_r1.2-robolectric-0.jar | Bin 0 -> 32062933 bytes v3/runtime/android-all-4.3_r2-robolectric-0.jar | Bin 0 -> 33644619 bytes v3/runtime/android-all-4.4_r1-robolectric-1.jar | Bin 0 -> 41609020 bytes v3/runtime/android-all-5.0.0_r2-robolectric-1.jar | Bin 0 -> 42868636 bytes v3/runtime/android-all-5.1.1_r9-robolectric-1.jar | Bin 0 -> 43608647 bytes v3/runtime/json-20080701.jar | Bin 0 -> 37875 bytes v3/runtime/shadows-core-3.1-SNAPSHOT-16.jar | Bin 0 -> 2659281 bytes v3/runtime/shadows-core-3.1-SNAPSHOT-17.jar | Bin 0 -> 2661915 bytes v3/runtime/shadows-core-3.1-SNAPSHOT-18.jar | Bin 0 -> 2667505 bytes v3/runtime/shadows-core-3.1-SNAPSHOT-19.jar | Bin 0 -> 2670228 bytes v3/runtime/shadows-core-3.1-SNAPSHOT-21.jar | Bin 0 -> 2671103 bytes v3/runtime/shadows-core-3.1-SNAPSHOT-22.jar | Bin 0 -> 2672254 bytes v3/runtime/tagsoup-1.2.jar | Bin 0 -> 90023 bytes v3/shadows-httpclient-3.1-SNAPSHOT.jar | Bin 0 -> 46286 bytes v3/shadows-multidex-3.1-SNAPSHOT.jar | Bin 0 -> 4157 bytes v3/shadows-play-services-3.1-SNAPSHOT.jar | Bin 0 -> 4399 bytes v3/shadows-support-v4-3.1-SNAPSHOT.jar | Bin 0 -> 26442 bytes v3/update_robolectric.sh | 31 +++++++++++++++ 739 files changed, 170 insertions(+) f522a20 Upgrade Robolectric v3 a9e2f60 Update Robolectric v3. 5525767 Update Robolectric v3. 6d201a1 Add MODULE_LICENSE and NOTICE 99fafb7 Add Robov3 to external/robolectric e5966b3 Add Robov3 to external/robolectric ========platform/external/skia between android-6.0.1_r46..android-6.0.1_r54========= b49207a Update SK_CRASH to default to abort(). DO NOT MERGE ========platform/external/sonivox between android-6.0.1_r46..android-6.0.1_r54========= 24d7c40 Sonivox: add SafetyNet log. 3ac0443 Sonivox: sanity check numSamples. ========platform/external/sqlite between android-6.0.1_r46..android-6.0.1_r54========= cccf840 Fix world-readable permissions due to sqlite race condition - DO NOT MERGE 12dfd61 sqlite: upgrade to patched SQLite 3.7.11 - DO NOT MERGE ========platform/external/tremolo between android-6.0.1_r46..android-6.0.1_r54========= Tremolo/res012.c | 197 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 100 insertions(+), 97 deletions(-) db8631a Check partword is in range for # of partitions 0cf80af Check partword is in range for # of partitions ========platform/external/webrtc between android-6.0.1_r46..android-6.0.1_r54========= d0e5361 Remove __DATE__ and __TIME__ from tracing ========platform/external/wpa_supplicant_8 between android-6.0.1_r46..android-6.0.1_r54========= src/eap_peer/eap_pwd.c | 7 +++---- src/eap_server/eap_server_pwd.c | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) 96d5871 Guard against return value already being null d996054 Remove newlines from config output 1e9857b WNM: Ignore Key Data in WNM Sleep Mode Response frame if no PMF in use c61bad6 EAP-pwd server: Fix last fragment length validation 3aa9ad5 EAP-pwd peer: Fix last fragment length validation ========platform/external/zlib between android-6.0.1_r46..android-6.0.1_r54========= Android.mk | 4 ---- 1 file changed, 4 deletions(-) 4423567 Always use the NDK for unbundled branches. ========platform/frameworks/av between android-6.0.1_r46..android-6.0.1_r54========= media/libmedia/Android.mk | 1 + media/libmedia/MediaUtils.cpp | 74 ++++++++++++++++++++++ media/libmedia/MediaUtils.h | 35 ++++++++++ media/libmediaplayerservice/MediaPlayerService.cpp | 9 ++- .../MetadataRetrieverClient.cpp | 1 + .../nuplayer/GenericSource.cpp | 34 ++++++---- media/libstagefright/DRMExtractor.cpp | 12 +++- media/libstagefright/MPEG4Extractor.cpp | 26 ++++++++ media/libstagefright/SampleIterator.cpp | 5 ++ .../codecs/on2/h264dec/source/h264bsd_storage.c | 24 ++++++- media/libstagefright/mpeg2ts/ATSParser.cpp | 7 ++ media/mediaserver/Android.mk | 1 + media/mediaserver/main_mediaserver.cpp | 6 ++ services/audioflinger/Threads.cpp | 23 ++++++- services/camera/libcameraservice/CameraService.cpp | 1 + 15 files changed, 236 insertions(+), 23 deletions(-) f31f0e4 Resolve a merge issue between lmp and lmp-mr1+ 0a68a0c MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. 856d945 limit mediaserver memory 7d78607 Check malloc result to avoid NPD 9d85f1d Fix security vulnerability in libstagefright 68465da h264bsdActivateParamSets: Prevent multiplication overflow. c111667 Clear unused pointer field when sending across binder a1bbd29 Check section size when verifying CRC d2a0af0 SampleTable.cpp: Fixed a regression caused by a fix for bug 28076789. 6912707 Resolve merge conflict when cp'ing ag/931301 to mnc-mr1-release 71fa9cd h264dec: check for overflows when calculating allocation size. 15b1877 codecs: check OMX buffer size before use in (avc|hevc|mpeg2)dec 2e0abb6 codecs: check OMX buffer size before use in (gsm|g711)dec 563c39a AudioSource: initialize variables 3812dd1 Check mp3 output buffer size 201862c codecs: check OMX buffer size before use in (h263|h264)dec 5896b85 DO NOT MERGE codecs: check OMX buffer size before use in (vorbis|opus)dec ef7b35f Fix OMX_IndexParamConsumerUsageBits size check 982ebad Fix size check for OMX_IndexParamConsumerUsageBits 1b96205 Fix initialization of AAC presentation struct 124d660 DO NOT MERGE Verify OMX buffer sizes prior to access 5c8f2a4 Fix AMR decoder 05ee9ed SoftAMR: check input buffer size to avoid overflow. 57cfe69 SoftAMR: check output buffer size to avoid overflow. 07d8d29 codecs: check OMX buffer size before use in VP8 encoder. b22375c NuPlayerStreamListener: NULL and bounds check before memcpy 7ef9d93 Camera3Device: Validate template ID d1ab8dd Add VPX output buffer size check 5db7307 Get service by value instead of reference b7c8681 Also fix out of bounds access for normal read d3e5eca Clear allocation to avoid info leak a685aea Fixing safteynet logging bug introduced in ag/862848 1a5ab71 3 uninitialized variables in IOMX.cpp 7227fe0 Fix info leak vulnerability of IDrm 52fbd46 IOMX.cpp uninitialized pointer in BnOMX::onTransact c400396 Camera: Disallow dumping clients directly c9ab2b0 Camera: Disallow dumping clients directly 6dd6c54 Camera: set mNumberOfNormalCameras correctly 5403587 Fix out-of-bounds write 113efbb audioflinger: fix standby delay on A2DP output 9cebd7c DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." 9e29523 fix possible overflow in effect wrappers. 50270d9 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. 22f824f Fix security vulnerability in ICrypto DO NOT MERGE 91a23ed DO NOT MERGE nuplayer: do not use cached source for wvm content 3d6a714 DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread 6afc659 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. 0462975 DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. 69bd1cf libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. 19c47af DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread 3599745 DO NOT MERGE Revert "AwesomePlayer: Separate cache buffer watermarks for offload audio" 92e4151 DO NOT MERGE Revert "AwesomePlayer: Stop posting buffering events once at EOS" ddbebb9 AwesomePlayer: Separate cache buffer watermarks for offload audio 701cac1 AwesomePlayer: Stop posting buffering events once at EOS 87f8cbb libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder. 7845a1f fix deadlock in MediaPlayerService BUG: 25263909 3994ffd Revert "Revert "audio policy: bind setMode() and setPhoneState() operations"" a754b4f Revert "Revert "AudioPolicyService: fix race in AudioCommandThread"" 26ce11a Revert "audio policy: bind setMode() and setPhoneState() operations" 75c82b5 Revert "AudioPolicyService: fix race in AudioCommandThread" 76d4c7f Reduce lock time for dump to make sure not locked when calling back to IResourceManagerClient. b49c385 ALooper::awaitResponse gets reply and returns immediately if the looper is stopped. e4b4cf1 DO NOT MERGE - audio flinger: fix fuzz test crash 2be5af3 DO NOT MERGE - IAudioFlinger: add checks on binder calls d005c5d NuPlayerRenderer: always update MediaClock with max media duration. b0063fe DO NOT MERGE audioflinger: dont release wakelock during offload drain sequence e90bf75 DO NOT MERGE AwesomePlayer: Separate cache buffer watermarks for offload audio ad0c79e DO NOT MERGE AwesomePlayer: Stop posting buffering events once at EOS ========platform/frameworks/base between android-6.0.1_r46..android-6.0.1_r54========= api/current.txt | 8 + api/system-current.txt | 20 + core/java/android/app/ActivityThread.java | 5 + core/java/android/app/ActivityView.java | 170 +++++--- core/java/android/app/Notification.java | 28 +- core/java/android/bluetooth/BluetoothDevice.java | 13 + core/java/android/bluetooth/BluetoothHeadset.java | 42 ++ .../android/bluetooth/BluetoothHeadsetClient.java | 35 ++ .../bluetooth/BluetoothHeadsetClientCall.java | 34 +- core/java/android/bluetooth/IBluetoothHeadset.aidl | 2 + .../android/bluetooth/IBluetoothHeadsetClient.aidl | 2 + core/java/android/content/Intent.java | 86 ++++ core/java/android/content/res/Resources.java | 207 ++++------ core/java/android/hardware/Camera.java | 4 +- .../hardware/camera2/CameraCharacteristics.java | 17 +- .../android/hardware/camera2/CameraMetadata.java | 4 +- .../android/hardware/camera2/CaptureRequest.java | 4 + core/java/android/net/INetworkPolicyManager.aidl | 3 + core/java/android/net/NetworkPolicyManager.java | 49 +++ core/java/android/net/PacProxySelector.java | 9 + core/java/android/nfc/NfcActivityManager.java | 64 +-- core/java/android/os/PowerManagerInternal.java | 6 + core/java/android/provider/Settings.java | 20 +- core/java/android/text/Layout.java | 56 +-- core/java/android/text/TextLine.java | 18 +- core/java/android/view/InputDevice.java | 9 + core/java/android/view/KeyEvent.java | 21 +- core/java/android/view/MotionEvent.java | 17 + core/java/android/view/View.java | 6 +- core/java/android/view/ViewRootImpl.java | 12 +- core/java/android/widget/LinearLayout.java | 22 +- core/java/android/widget/RemoteViews.java | 41 +- core/java/android/widget/TableRow.java | 2 +- .../com/android/internal/app/ChooserActivity.java | 14 +- .../com/android/internal/os/BatteryStatsImpl.java | 65 +-- .../android/internal/os/KernelCpuSpeedReader.java | 13 +- .../com/android/internal/os/ProcessCpuTracker.java | 4 +- .../com/android/internal/util/StateMachine.java | 27 ++ .../android/internal/widget/LockPatternUtils.java | 18 + .../internal/widget/SwipeDismissLayout.java | 19 +- core/jni/android/graphics/Bitmap.cpp | 1 + core/jni/com_android_internal_os_Zygote.cpp | 26 +- core/res/AndroidManifest.xml | 8 + core/res/res/values-af-watch/strings.xml | 1 + core/res/res/values-af/strings.xml | 24 +- core/res/res/values-am-watch/strings.xml | 1 + core/res/res/values-am/strings.xml | 24 +- core/res/res/values-ar-watch/strings.xml | 1 + core/res/res/values-ar/strings.xml | 24 +- core/res/res/values-az-rAZ-watch/strings.xml | 1 + core/res/res/values-az-rAZ/strings.xml | 24 +- core/res/res/values-bg-watch/strings.xml | 1 + core/res/res/values-bg/strings.xml | 24 +- core/res/res/values-bn-rBD-watch/strings.xml | 1 + core/res/res/values-bn-rBD/strings.xml | 24 +- core/res/res/values-ca-watch/strings.xml | 1 + core/res/res/values-ca/strings.xml | 24 +- core/res/res/values-cs-watch/strings.xml | 1 + core/res/res/values-cs/strings.xml | 24 +- core/res/res/values-da-watch/strings.xml | 1 + core/res/res/values-da/strings.xml | 24 +- core/res/res/values-de-watch/strings.xml | 1 + core/res/res/values-de/strings.xml | 24 +- core/res/res/values-el-watch/strings.xml | 1 + core/res/res/values-el/strings.xml | 24 +- core/res/res/values-en-rAU-watch/strings.xml | 1 + core/res/res/values-en-rAU/strings.xml | 24 +- core/res/res/values-en-rGB-watch/strings.xml | 1 + core/res/res/values-en-rGB/strings.xml | 24 +- core/res/res/values-en-rIN-watch/strings.xml | 1 + core/res/res/values-en-rIN/strings.xml | 24 +- core/res/res/values-es-rUS-watch/strings.xml | 1 + core/res/res/values-es-rUS/strings.xml | 24 +- core/res/res/values-es-watch/strings.xml | 1 + core/res/res/values-es/strings.xml | 24 +- core/res/res/values-et-rEE-watch/strings.xml | 1 + core/res/res/values-et-rEE/strings.xml | 24 +- core/res/res/values-eu-rES-watch/strings.xml | 1 + core/res/res/values-eu-rES/strings.xml | 24 +- core/res/res/values-fa-watch/strings.xml | 1 + core/res/res/values-fa/strings.xml | 26 +- core/res/res/values-fi-watch/strings.xml | 1 + core/res/res/values-fi/strings.xml | 24 +- core/res/res/values-fr-rCA-watch/strings.xml | 1 + core/res/res/values-fr-rCA/strings.xml | 24 +- core/res/res/values-fr-watch/strings.xml | 1 + core/res/res/values-fr/strings.xml | 26 +- core/res/res/values-gl-rES-watch/strings.xml | 1 + core/res/res/values-gl-rES/strings.xml | 24 +- core/res/res/values-gu-rIN-watch/strings.xml | 1 + core/res/res/values-gu-rIN/strings.xml | 24 +- core/res/res/values-hi-watch/strings.xml | 1 + core/res/res/values-hi/strings.xml | 24 +- core/res/res/values-hr-watch/strings.xml | 1 + core/res/res/values-hr/strings.xml | 24 +- core/res/res/values-hu-watch/strings.xml | 1 + core/res/res/values-hu/strings.xml | 62 +-- core/res/res/values-hy-rAM-watch/strings.xml | 1 + core/res/res/values-hy-rAM/strings.xml | 24 +- core/res/res/values-in-watch/strings.xml | 1 + core/res/res/values-in/strings.xml | 24 +- core/res/res/values-is-rIS-watch/strings.xml | 1 + core/res/res/values-is-rIS/strings.xml | 24 +- core/res/res/values-it-watch/strings.xml | 1 + core/res/res/values-it/strings.xml | 24 +- core/res/res/values-iw-watch/strings.xml | 1 + core/res/res/values-iw/strings.xml | 24 +- core/res/res/values-ja-watch/strings.xml | 1 + core/res/res/values-ja/strings.xml | 26 +- core/res/res/values-ka-rGE-watch/strings.xml | 1 + core/res/res/values-ka-rGE/strings.xml | 24 +- core/res/res/values-kk-rKZ-watch/strings.xml | 1 + core/res/res/values-kk-rKZ/strings.xml | 24 +- core/res/res/values-km-rKH-watch/strings.xml | 1 + core/res/res/values-km-rKH/strings.xml | 24 +- core/res/res/values-kn-rIN-watch/strings.xml | 1 + core/res/res/values-kn-rIN/strings.xml | 24 +- core/res/res/values-ko-watch/strings.xml | 1 + core/res/res/values-ko/strings.xml | 24 +- core/res/res/values-ky-rKG-watch/strings.xml | 1 + core/res/res/values-ky-rKG/strings.xml | 25 +- core/res/res/values-lo-rLA-watch/strings.xml | 1 + core/res/res/values-lo-rLA/strings.xml | 24 +- core/res/res/values-lt-watch/strings.xml | 1 + core/res/res/values-lt/strings.xml | 24 +- core/res/res/values-lv-watch/strings.xml | 1 + core/res/res/values-lv/strings.xml | 24 +- core/res/res/values-mcc208-mnc01/config.xml | 3 - core/res/res/values-mcc208-mnc10/config.xml | 5 - core/res/res/values-mcc214-mnc07/config.xml | 1 - core/res/res/values-mcc222-mnc10/config.xml | 10 - core/res/res/values-mcc234-mnc20/config.xml | 10 - core/res/res/values-mcc302-mnc220/config.xml | 2 +- core/res/res/values-mcc310-mnc160-af/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-am/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-ar/strings.xml | 32 ++ .../strings.xml | 8 +- core/res/res/values-mcc310-mnc160-bg/strings.xml | 32 ++ .../res/values-mcc310-mnc160-bn-rBD/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-ca/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-cs/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-da/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-de/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-el/strings.xml | 32 ++ .../res/values-mcc310-mnc160-en-rAU/strings.xml | 32 ++ .../res/values-mcc310-mnc160-en-rGB/strings.xml | 32 ++ .../res/values-mcc310-mnc160-en-rIN/strings.xml | 32 ++ .../res/values-mcc310-mnc160-es-rUS/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-es/strings.xml | 32 ++ .../res/values-mcc310-mnc160-et-rEE/strings.xml | 32 ++ .../res/values-mcc310-mnc160-eu-rES/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-fa/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-fi/strings.xml | 32 ++ .../res/values-mcc310-mnc160-fr-rCA/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-fr/strings.xml | 32 ++ .../res/values-mcc310-mnc160-gl-rES/strings.xml | 32 ++ .../res/values-mcc310-mnc160-gu-rIN/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-hi/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-hr/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-hu/strings.xml | 32 ++ .../res/values-mcc310-mnc160-hy-rAM/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-in/strings.xml | 32 ++ .../res/values-mcc310-mnc160-is-rIS/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-it/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-iw/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-ja/strings.xml | 32 ++ .../res/values-mcc310-mnc160-ka-rGE/strings.xml | 32 ++ .../res/values-mcc310-mnc160-kk-rKZ/strings.xml | 32 ++ .../res/values-mcc310-mnc160-km-rKH/strings.xml | 32 ++ .../res/values-mcc310-mnc160-kn-rIN/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-ko/strings.xml | 32 ++ .../res/values-mcc310-mnc160-ky-rKG/strings.xml | 32 ++ .../res/values-mcc310-mnc160-lo-rLA/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-lt/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-lv/strings.xml | 32 ++ .../res/values-mcc310-mnc160-mk-rMK/strings.xml | 32 ++ .../res/values-mcc310-mnc160-ml-rIN/strings.xml | 32 ++ .../res/values-mcc310-mnc160-mn-rMN/strings.xml | 32 ++ .../res/values-mcc310-mnc160-mr-rIN/strings.xml | 32 ++ .../res/values-mcc310-mnc160-ms-rMY/strings.xml | 32 ++ .../res/values-mcc310-mnc160-my-rMM/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-nb/strings.xml | 32 ++ .../res/values-mcc310-mnc160-ne-rNP/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-nl/strings.xml | 32 ++ .../res/values-mcc310-mnc160-pa-rIN/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-pl/strings.xml | 32 ++ .../strings.xml | 8 +- .../res/values-mcc310-mnc160-pt-rPT/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-pt/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-ro/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-ru/strings.xml | 32 ++ .../res/values-mcc310-mnc160-si-rLK/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-sk/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-sl/strings.xml | 32 ++ .../res/values-mcc310-mnc160-sq-rAL/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-sr/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-sv/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-sw/strings.xml | 32 ++ .../res/values-mcc310-mnc160-ta-rIN/strings.xml | 32 ++ .../res/values-mcc310-mnc160-te-rIN/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-th/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-tl/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-tr/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-uk/strings.xml | 32 ++ .../res/values-mcc310-mnc160-ur-rPK/strings.xml | 32 ++ .../res/values-mcc310-mnc160-uz-rUZ/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-vi/strings.xml | 32 ++ .../res/values-mcc310-mnc160-zh-rCN/strings.xml | 32 ++ .../res/values-mcc310-mnc160-zh-rHK/strings.xml | 32 ++ .../res/values-mcc310-mnc160-zh-rTW/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160-zu/strings.xml | 32 ++ core/res/res/values-mcc310-mnc160/strings.xml | 38 ++ core/res/res/values-mcc310-mnc200/strings.xml | 38 ++ core/res/res/values-mcc310-mnc210/strings.xml | 38 ++ core/res/res/values-mcc310-mnc220/strings.xml | 38 ++ core/res/res/values-mcc310-mnc230/strings.xml | 38 ++ core/res/res/values-mcc310-mnc240/strings.xml | 38 ++ core/res/res/values-mcc310-mnc250/strings.xml | 38 ++ core/res/res/values-mcc310-mnc260-de/strings.xml | 4 +- .../res/values-mcc310-mnc260-kn-rIN/strings.xml | 4 +- .../res/values-mcc310-mnc260-ml-rIN/strings.xml | 4 +- core/res/res/values-mcc310-mnc260-nl/strings.xml | 4 +- core/res/res/values-mcc310-mnc270/strings.xml | 38 ++ core/res/res/values-mcc310-mnc310/strings.xml | 38 ++ core/res/res/values-mcc310-mnc490/strings.xml | 38 ++ core/res/res/values-mcc310-mnc660/strings.xml | 38 ++ core/res/res/values-mcc310-mnc800/strings.xml | 38 ++ core/res/res/values-mk-rMK-watch/strings.xml | 1 + core/res/res/values-mk-rMK/strings.xml | 24 +- core/res/res/values-ml-rIN-watch/strings.xml | 1 + core/res/res/values-ml-rIN/strings.xml | 24 +- core/res/res/values-mn-rMN-watch/strings.xml | 1 + core/res/res/values-mn-rMN/strings.xml | 24 +- core/res/res/values-mr-rIN-watch/strings.xml | 1 + core/res/res/values-mr-rIN/strings.xml | 24 +- core/res/res/values-ms-rMY-watch/strings.xml | 1 + core/res/res/values-ms-rMY/strings.xml | 24 +- core/res/res/values-my-rMM-watch/strings.xml | 1 + core/res/res/values-my-rMM/strings.xml | 24 +- core/res/res/values-nb-watch/strings.xml | 1 + core/res/res/values-nb/strings.xml | 26 +- core/res/res/values-ne-rNP-watch/strings.xml | 1 + core/res/res/values-ne-rNP/strings.xml | 24 +- core/res/res/values-nl-watch/strings.xml | 1 + core/res/res/values-nl/strings.xml | 24 +- core/res/res/values-pa-rIN-watch/strings.xml | 1 + core/res/res/values-pa-rIN/strings.xml | 24 +- core/res/res/values-pl-watch/strings.xml | 1 + core/res/res/values-pl/strings.xml | 24 +- core/res/res/values-pt-rBR-watch/strings.xml | 1 + core/res/res/values-pt-rBR/strings.xml | 24 +- core/res/res/values-pt-rPT-watch/strings.xml | 1 + core/res/res/values-pt-rPT/strings.xml | 24 +- core/res/res/values-pt-watch/strings.xml | 1 + core/res/res/values-pt/strings.xml | 24 +- core/res/res/values-ro-watch/strings.xml | 1 + core/res/res/values-ro/strings.xml | 104 ++--- core/res/res/values-ru-watch/strings.xml | 1 + core/res/res/values-ru/strings.xml | 24 +- core/res/res/values-si-rLK-watch/strings.xml | 1 + core/res/res/values-si-rLK/strings.xml | 24 +- core/res/res/values-sk-watch/strings.xml | 1 + core/res/res/values-sk/strings.xml | 24 +- core/res/res/values-sl-watch/strings.xml | 1 + core/res/res/values-sl/strings.xml | 24 +- core/res/res/values-sq-rAL-watch/strings.xml | 1 + core/res/res/values-sq-rAL/strings.xml | 24 +- core/res/res/values-sr-watch/strings.xml | 1 + core/res/res/values-sr/strings.xml | 24 +- core/res/res/values-sv-watch/strings.xml | 1 + core/res/res/values-sv/strings.xml | 24 +- core/res/res/values-sw-watch/strings.xml | 1 + core/res/res/values-sw/strings.xml | 24 +- core/res/res/values-ta-rIN-watch/strings.xml | 1 + core/res/res/values-ta-rIN/strings.xml | 24 +- core/res/res/values-te-rIN-watch/strings.xml | 1 + core/res/res/values-te-rIN/strings.xml | 24 +- core/res/res/values-th-watch/strings.xml | 1 + core/res/res/values-th/strings.xml | 24 +- core/res/res/values-tl-watch/strings.xml | 1 + core/res/res/values-tl/strings.xml | 24 +- core/res/res/values-tr-watch/strings.xml | 1 + core/res/res/values-tr/strings.xml | 24 +- core/res/res/values-uk-watch/strings.xml | 1 + core/res/res/values-uk/strings.xml | 24 +- core/res/res/values-ur-rPK-watch/strings.xml | 1 + core/res/res/values-ur-rPK/strings.xml | 24 +- core/res/res/values-uz-rUZ-watch/strings.xml | 1 + core/res/res/values-uz-rUZ/strings.xml | 60 +-- core/res/res/values-vi-watch/strings.xml | 1 + core/res/res/values-vi/strings.xml | 24 +- core/res/res/values-watch/config.xml | 6 + core/res/res/values-watch/strings.xml | 3 + core/res/res/values-zh-rCN-watch/strings.xml | 1 + core/res/res/values-zh-rCN/strings.xml | 64 +-- core/res/res/values-zh-rHK-watch/strings.xml | 1 + core/res/res/values-zh-rHK/strings.xml | 24 +- core/res/res/values-zh-rTW-watch/strings.xml | 1 + core/res/res/values-zh-rTW/strings.xml | 24 +- core/res/res/values-zu-watch/strings.xml | 1 + core/res/res/values-zu/strings.xml | 24 +- core/res/res/values/attrs.xml | 12 + core/res/res/values/config.xml | 41 +- core/res/res/values/dimens.xml | 4 - core/res/res/values/strings.xml | 24 +- core/res/res/values/styles_micro.xml | 5 + core/res/res/values/symbols.xml | 12 +- core/tests/BTtraffic/Android.mk | 16 + core/tests/BTtraffic/AndroidManifest.xml | 22 ++ core/tests/BTtraffic/README | 45 +++ core/tests/BTtraffic/res/values/strings.xml | 3 + .../google/experimental/bttraffic/BTtraffic.java | 328 ++++++++++++++++ core/tests/SvcMonitor/Android.mk | 16 + core/tests/SvcMonitor/AndroidManifest.xml | 21 + core/tests/SvcMonitor/README | 27 ++ core/tests/SvcMonitor/res/values/strings.xml | 3 + .../google/experimental/svcmoniter/SvcMonitor.java | 209 ++++++++++ core/tests/bluetoothtests/AndroidManifest.xml | 1 + .../text/StaticLayoutTextMeasuringTest.java | 77 ++++ .../guide/topics/manifest/uses-feature-element.jd | 9 +- docs/html/tools/support-library/features.jd | 4 +- docs/html/tools/support-library/index.jd | 2 +- libs/hwui/Caches.cpp | 2 +- libs/hwui/GammaFontRenderer.cpp | 4 +- libs/hwui/Layer.cpp | 2 +- libs/hwui/renderthread/CanvasContext.cpp | 4 +- media/java/android/media/AudioAttributes.java | 6 +- media/java/android/media/MediaScanner.java | 95 +++-- .../res/values-az-rAZ/strings.xml | 1 - .../res/values-fa/strings.xml | 4 +- .../res/values-hr/strings.xml | 6 +- .../res/values-it/strings.xml | 2 +- .../res/values-iw/strings.xml | 2 +- .../res/values-ml-rIN/strings.xml | 2 +- .../res/values-nl/strings.xml | 14 +- .../res/values-pt-rBR/strings.xml | 39 -- .../res/values-ro/strings.xml | 6 +- .../res/values-sk/strings.xml | 2 +- .../res/values-sv/strings.xml | 2 +- .../res/values-uz-rUZ/strings.xml | 2 +- .../CaptivePortalLogin/res/values-af/strings.xml | 3 - .../CaptivePortalLogin/res/values-am/strings.xml | 3 - .../CaptivePortalLogin/res/values-ar/strings.xml | 3 - .../res/values-az-rAZ/strings.xml | 11 - .../CaptivePortalLogin/res/values-bg/strings.xml | 3 - .../res/values-bn-rBD/strings.xml | 3 - .../CaptivePortalLogin/res/values-ca/strings.xml | 3 - .../CaptivePortalLogin/res/values-cs/strings.xml | 3 - .../CaptivePortalLogin/res/values-da/strings.xml | 3 - .../CaptivePortalLogin/res/values-de/strings.xml | 3 - .../CaptivePortalLogin/res/values-el/strings.xml | 3 - .../res/values-en-rAU/strings.xml | 3 - .../res/values-en-rGB/strings.xml | 3 - .../res/values-en-rIN/strings.xml | 3 - .../res/values-es-rUS/strings.xml | 3 - .../CaptivePortalLogin/res/values-es/strings.xml | 3 - .../res/values-et-rEE/strings.xml | 3 - .../res/values-eu-rES/strings.xml | 3 - .../CaptivePortalLogin/res/values-fa/strings.xml | 3 - .../CaptivePortalLogin/res/values-fi/strings.xml | 3 - .../res/values-fr-rCA/strings.xml | 3 - .../CaptivePortalLogin/res/values-fr/strings.xml | 3 - .../res/values-gl-rES/strings.xml | 3 - .../res/values-gu-rIN/strings.xml | 3 - .../CaptivePortalLogin/res/values-hi/strings.xml | 3 - .../CaptivePortalLogin/res/values-hr/strings.xml | 3 - .../CaptivePortalLogin/res/values-hu/strings.xml | 3 - .../res/values-hy-rAM/strings.xml | 3 - .../CaptivePortalLogin/res/values-in/strings.xml | 3 - .../res/values-is-rIS/strings.xml | 3 - .../CaptivePortalLogin/res/values-it/strings.xml | 3 - .../CaptivePortalLogin/res/values-iw/strings.xml | 3 - .../CaptivePortalLogin/res/values-ja/strings.xml | 3 - .../res/values-ka-rGE/strings.xml | 3 - .../res/values-kk-rKZ/strings.xml | 3 - .../res/values-km-rKH/strings.xml | 3 - .../res/values-kn-rIN/strings.xml | 3 - .../CaptivePortalLogin/res/values-ko/strings.xml | 3 - .../res/values-ky-rKG/strings.xml | 3 - .../res/values-lo-rLA/strings.xml | 3 - .../CaptivePortalLogin/res/values-lt/strings.xml | 3 - .../CaptivePortalLogin/res/values-lv/strings.xml | 3 - .../res/values-mk-rMK/strings.xml | 3 - .../res/values-ml-rIN/strings.xml | 3 - .../res/values-mn-rMN/strings.xml | 3 - .../res/values-mr-rIN/strings.xml | 3 - .../res/values-ms-rMY/strings.xml | 3 - .../res/values-my-rMM/strings.xml | 3 - .../CaptivePortalLogin/res/values-nb/strings.xml | 3 - .../res/values-ne-rNP/strings.xml | 3 - .../CaptivePortalLogin/res/values-nl/strings.xml | 3 - .../res/values-pa-rIN/strings.xml | 3 - .../CaptivePortalLogin/res/values-pl/strings.xml | 3 - .../res/values-pt-rBR/strings.xml | 11 - .../res/values-pt-rPT/strings.xml | 3 - .../CaptivePortalLogin/res/values-pt/strings.xml | 3 - .../CaptivePortalLogin/res/values-ro/strings.xml | 3 - .../CaptivePortalLogin/res/values-ru/strings.xml | 3 - .../res/values-si-rLK/strings.xml | 3 - .../CaptivePortalLogin/res/values-sk/strings.xml | 3 - .../CaptivePortalLogin/res/values-sl/strings.xml | 3 - .../res/values-sq-rAL/strings.xml | 3 - .../CaptivePortalLogin/res/values-sr/strings.xml | 3 - .../CaptivePortalLogin/res/values-sv/strings.xml | 3 - .../CaptivePortalLogin/res/values-sw/strings.xml | 3 - .../res/values-ta-rIN/strings.xml | 3 - .../res/values-te-rIN/strings.xml | 3 - .../CaptivePortalLogin/res/values-th/strings.xml | 3 - .../CaptivePortalLogin/res/values-tl/strings.xml | 3 - .../CaptivePortalLogin/res/values-tr/strings.xml | 3 - .../CaptivePortalLogin/res/values-uk/strings.xml | 3 - .../res/values-ur-rPK/strings.xml | 3 - .../res/values-uz-rUZ/strings.xml | 3 - .../CaptivePortalLogin/res/values-vi/strings.xml | 3 - .../res/values-zh-rCN/strings.xml | 3 - .../res/values-zh-rHK/strings.xml | 3 - .../res/values-zh-rTW/strings.xml | 3 - .../CaptivePortalLogin/res/values-zu/strings.xml | 3 - .../res/values-fr/strings.xml | 2 +- .../res/values-kk-rKZ/strings.xml | 2 +- .../res/values-pt-rBR/strings.xml | 24 -- .../res/values-pt-rPT/strings.xml | 2 +- packages/DocumentsUI/res/values-af/strings.xml | 7 +- packages/DocumentsUI/res/values-am/strings.xml | 5 +- packages/DocumentsUI/res/values-ar/strings.xml | 5 +- packages/DocumentsUI/res/values-az-rAZ/strings.xml | 33 +- packages/DocumentsUI/res/values-bg/strings.xml | 9 +- packages/DocumentsUI/res/values-bn-rBD/strings.xml | 7 +- packages/DocumentsUI/res/values-ca/strings.xml | 7 +- packages/DocumentsUI/res/values-cs/strings.xml | 9 +- packages/DocumentsUI/res/values-da/strings.xml | 7 +- packages/DocumentsUI/res/values-de/strings.xml | 5 +- packages/DocumentsUI/res/values-el/strings.xml | 5 +- packages/DocumentsUI/res/values-en-rAU/strings.xml | 5 +- packages/DocumentsUI/res/values-en-rGB/strings.xml | 5 +- packages/DocumentsUI/res/values-en-rIN/strings.xml | 5 +- packages/DocumentsUI/res/values-es-rUS/strings.xml | 5 +- packages/DocumentsUI/res/values-es/strings.xml | 11 +- packages/DocumentsUI/res/values-et-rEE/strings.xml | 5 +- packages/DocumentsUI/res/values-eu-rES/strings.xml | 5 +- packages/DocumentsUI/res/values-fa/strings.xml | 15 +- packages/DocumentsUI/res/values-fi/strings.xml | 5 +- packages/DocumentsUI/res/values-fr-rCA/strings.xml | 7 +- packages/DocumentsUI/res/values-fr/strings.xml | 5 +- packages/DocumentsUI/res/values-gl-rES/strings.xml | 5 +- packages/DocumentsUI/res/values-gu-rIN/strings.xml | 15 +- packages/DocumentsUI/res/values-hi/strings.xml | 7 +- packages/DocumentsUI/res/values-hr/strings.xml | 7 +- packages/DocumentsUI/res/values-hu/strings.xml | 5 +- packages/DocumentsUI/res/values-hy-rAM/strings.xml | 7 +- packages/DocumentsUI/res/values-in/strings.xml | 7 +- packages/DocumentsUI/res/values-is-rIS/strings.xml | 5 +- packages/DocumentsUI/res/values-it/strings.xml | 7 +- packages/DocumentsUI/res/values-iw/strings.xml | 5 +- packages/DocumentsUI/res/values-ja/strings.xml | 5 +- packages/DocumentsUI/res/values-ka-rGE/strings.xml | 5 +- packages/DocumentsUI/res/values-kk-rKZ/strings.xml | 11 +- packages/DocumentsUI/res/values-km-rKH/strings.xml | 5 +- packages/DocumentsUI/res/values-kn-rIN/strings.xml | 7 +- packages/DocumentsUI/res/values-ko/strings.xml | 5 +- packages/DocumentsUI/res/values-ky-rKG/strings.xml | 5 +- packages/DocumentsUI/res/values-lo-rLA/strings.xml | 5 +- packages/DocumentsUI/res/values-lt/strings.xml | 5 +- packages/DocumentsUI/res/values-lv/strings.xml | 5 +- packages/DocumentsUI/res/values-mk-rMK/strings.xml | 5 +- packages/DocumentsUI/res/values-ml-rIN/strings.xml | 9 +- packages/DocumentsUI/res/values-mn-rMN/strings.xml | 5 +- packages/DocumentsUI/res/values-mr-rIN/strings.xml | 5 +- packages/DocumentsUI/res/values-ms-rMY/strings.xml | 7 +- packages/DocumentsUI/res/values-my-rMM/strings.xml | 5 +- packages/DocumentsUI/res/values-nb/strings.xml | 9 +- packages/DocumentsUI/res/values-ne-rNP/strings.xml | 5 +- packages/DocumentsUI/res/values-nl/strings.xml | 5 +- packages/DocumentsUI/res/values-pa-rIN/strings.xml | 5 +- packages/DocumentsUI/res/values-pl/strings.xml | 7 +- packages/DocumentsUI/res/values-pt-rBR/strings.xml | 74 ---- packages/DocumentsUI/res/values-pt-rPT/strings.xml | 5 +- packages/DocumentsUI/res/values-pt/strings.xml | 5 +- packages/DocumentsUI/res/values-ro/strings.xml | 7 +- packages/DocumentsUI/res/values-ru/strings.xml | 5 +- packages/DocumentsUI/res/values-si-rLK/strings.xml | 5 +- packages/DocumentsUI/res/values-sk/strings.xml | 13 +- packages/DocumentsUI/res/values-sl/strings.xml | 11 +- packages/DocumentsUI/res/values-sq-rAL/strings.xml | 9 +- packages/DocumentsUI/res/values-sr/strings.xml | 5 +- packages/DocumentsUI/res/values-sv/strings.xml | 5 +- packages/DocumentsUI/res/values-sw/strings.xml | 5 +- packages/DocumentsUI/res/values-ta-rIN/strings.xml | 11 +- packages/DocumentsUI/res/values-te-rIN/strings.xml | 7 +- packages/DocumentsUI/res/values-th/strings.xml | 5 +- packages/DocumentsUI/res/values-tl/strings.xml | 11 +- packages/DocumentsUI/res/values-tr/strings.xml | 5 +- packages/DocumentsUI/res/values-uk/strings.xml | 7 +- packages/DocumentsUI/res/values-ur-rPK/strings.xml | 7 +- packages/DocumentsUI/res/values-uz-rUZ/strings.xml | 17 +- packages/DocumentsUI/res/values-vi/strings.xml | 5 +- packages/DocumentsUI/res/values-zh-rCN/strings.xml | 5 +- packages/DocumentsUI/res/values-zh-rHK/strings.xml | 5 +- packages/DocumentsUI/res/values-zh-rTW/strings.xml | 5 +- packages/DocumentsUI/res/values-zu/strings.xml | 5 +- .../res/values-az-rAZ/strings.xml | 1 - .../res/values-da/strings.xml | 4 +- .../res/values-fa/strings.xml | 2 +- .../res/values-ml-rIN/strings.xml | 4 +- .../res/values-pt-rBR/strings.xml | 22 -- .../res/values-ru/strings.xml | 2 +- .../FusedLocation/res/values-az-rAZ/strings.xml | 5 - .../FusedLocation/res/values-kk-rKZ/strings.xml | 2 +- .../InputDevices/res/values-az-rAZ/strings.xml | 43 -- .../InputDevices/res/values-pt-rBR/strings.xml | 43 -- packages/InputDevices/res/values-uk/strings.xml | 2 +- .../InputDevices/res/values-uz-rUZ/strings.xml | 2 +- packages/Keyguard/res/values-de/strings.xml | 76 ++-- packages/Keyguard/res/values-hu/strings.xml | 18 +- packages/Keyguard/res/values-ja/strings.xml | 4 +- packages/Keyguard/res/values-mr-rIN/strings.xml | 2 +- packages/Keyguard/res/values-ne-rNP/strings.xml | 10 +- packages/Keyguard/res/values-ro/strings.xml | 4 +- packages/Keyguard/res/values-uz-rUZ/strings.xml | 40 +- packages/Keyguard/res/values-zh-rCN/strings.xml | 4 +- packages/Keyguard/res/values-zh-rTW/strings.xml | 14 +- packages/PrintSpooler/res/values-af/strings.xml | 2 +- packages/PrintSpooler/res/values-am/strings.xml | 2 +- packages/PrintSpooler/res/values-ar/strings.xml | 2 +- .../PrintSpooler/res/values-az-rAZ/strings.xml | 95 ----- packages/PrintSpooler/res/values-bg/strings.xml | 4 +- .../PrintSpooler/res/values-bn-rBD/strings.xml | 2 +- packages/PrintSpooler/res/values-ca/strings.xml | 2 +- packages/PrintSpooler/res/values-cs/strings.xml | 6 +- packages/PrintSpooler/res/values-da/strings.xml | 2 +- packages/PrintSpooler/res/values-de/strings.xml | 2 +- packages/PrintSpooler/res/values-el/strings.xml | 2 +- .../PrintSpooler/res/values-en-rAU/strings.xml | 2 +- .../PrintSpooler/res/values-en-rGB/strings.xml | 2 +- .../PrintSpooler/res/values-en-rIN/strings.xml | 2 +- .../PrintSpooler/res/values-es-rUS/strings.xml | 2 +- packages/PrintSpooler/res/values-es/strings.xml | 4 +- .../PrintSpooler/res/values-et-rEE/strings.xml | 2 +- .../PrintSpooler/res/values-eu-rES/strings.xml | 4 +- packages/PrintSpooler/res/values-fa/strings.xml | 4 +- packages/PrintSpooler/res/values-fi/strings.xml | 2 +- .../PrintSpooler/res/values-fr-rCA/strings.xml | 2 +- packages/PrintSpooler/res/values-fr/strings.xml | 4 +- .../PrintSpooler/res/values-gl-rES/strings.xml | 2 +- .../PrintSpooler/res/values-gu-rIN/strings.xml | 2 +- packages/PrintSpooler/res/values-hi/strings.xml | 2 +- packages/PrintSpooler/res/values-hr/strings.xml | 2 +- packages/PrintSpooler/res/values-hu/strings.xml | 2 +- .../PrintSpooler/res/values-hy-rAM/strings.xml | 2 +- packages/PrintSpooler/res/values-in/strings.xml | 2 +- .../PrintSpooler/res/values-is-rIS/strings.xml | 2 +- packages/PrintSpooler/res/values-it/strings.xml | 6 +- packages/PrintSpooler/res/values-iw/strings.xml | 2 +- packages/PrintSpooler/res/values-ja/strings.xml | 4 +- .../PrintSpooler/res/values-ka-rGE/strings.xml | 2 +- .../PrintSpooler/res/values-kk-rKZ/strings.xml | 2 +- .../PrintSpooler/res/values-km-rKH/strings.xml | 2 +- .../PrintSpooler/res/values-kn-rIN/strings.xml | 8 +- packages/PrintSpooler/res/values-ko/strings.xml | 2 +- .../PrintSpooler/res/values-ky-rKG/strings.xml | 2 +- .../PrintSpooler/res/values-lo-rLA/strings.xml | 2 +- packages/PrintSpooler/res/values-lt/strings.xml | 2 +- packages/PrintSpooler/res/values-lv/strings.xml | 2 +- .../PrintSpooler/res/values-mk-rMK/strings.xml | 2 +- .../PrintSpooler/res/values-ml-rIN/strings.xml | 2 +- .../PrintSpooler/res/values-mn-rMN/strings.xml | 2 +- .../PrintSpooler/res/values-mr-rIN/strings.xml | 2 +- .../PrintSpooler/res/values-ms-rMY/strings.xml | 2 +- .../PrintSpooler/res/values-my-rMM/strings.xml | 2 +- packages/PrintSpooler/res/values-nb/strings.xml | 2 +- .../PrintSpooler/res/values-ne-rNP/strings.xml | 2 +- packages/PrintSpooler/res/values-nl/strings.xml | 2 +- .../PrintSpooler/res/values-pa-rIN/strings.xml | 2 +- packages/PrintSpooler/res/values-pl/strings.xml | 2 +- .../PrintSpooler/res/values-pt-rBR/strings.xml | 95 ----- .../PrintSpooler/res/values-pt-rPT/strings.xml | 2 +- packages/PrintSpooler/res/values-pt/strings.xml | 2 +- packages/PrintSpooler/res/values-ro/strings.xml | 2 +- packages/PrintSpooler/res/values-ru/strings.xml | 2 +- .../PrintSpooler/res/values-si-rLK/strings.xml | 2 +- packages/PrintSpooler/res/values-sk/strings.xml | 6 +- packages/PrintSpooler/res/values-sl/strings.xml | 2 +- .../PrintSpooler/res/values-sq-rAL/strings.xml | 2 +- packages/PrintSpooler/res/values-sr/strings.xml | 4 +- packages/PrintSpooler/res/values-sv/strings.xml | 2 +- packages/PrintSpooler/res/values-sw/strings.xml | 2 +- .../PrintSpooler/res/values-ta-rIN/strings.xml | 2 +- .../PrintSpooler/res/values-te-rIN/strings.xml | 2 +- packages/PrintSpooler/res/values-th/strings.xml | 2 +- packages/PrintSpooler/res/values-tl/strings.xml | 2 +- packages/PrintSpooler/res/values-tr/strings.xml | 2 +- packages/PrintSpooler/res/values-uk/strings.xml | 2 +- .../PrintSpooler/res/values-ur-rPK/strings.xml | 2 +- .../PrintSpooler/res/values-uz-rUZ/strings.xml | 16 +- packages/PrintSpooler/res/values-vi/strings.xml | 2 +- .../PrintSpooler/res/values-zh-rCN/strings.xml | 2 +- .../PrintSpooler/res/values-zh-rHK/strings.xml | 2 +- .../PrintSpooler/res/values-zh-rTW/strings.xml | 2 +- packages/PrintSpooler/res/values-zu/strings.xml | 2 +- packages/SettingsLib/res/values-af/arrays.xml | 51 --- packages/SettingsLib/res/values-af/strings.xml | 86 ---- packages/SettingsLib/res/values-am/arrays.xml | 51 --- packages/SettingsLib/res/values-am/strings.xml | 86 ---- packages/SettingsLib/res/values-ar/arrays.xml | 51 --- packages/SettingsLib/res/values-ar/strings.xml | 86 ---- packages/SettingsLib/res/values-az-rAZ/arrays.xml | 51 --- packages/SettingsLib/res/values-az-rAZ/strings.xml | 86 ---- packages/SettingsLib/res/values-bg/arrays.xml | 51 --- packages/SettingsLib/res/values-bg/strings.xml | 86 ---- packages/SettingsLib/res/values-bn-rBD/arrays.xml | 51 --- packages/SettingsLib/res/values-bn-rBD/strings.xml | 86 ---- packages/SettingsLib/res/values-ca/arrays.xml | 51 --- packages/SettingsLib/res/values-ca/strings.xml | 86 ---- packages/SettingsLib/res/values-cs/arrays.xml | 51 --- packages/SettingsLib/res/values-cs/strings.xml | 86 ---- packages/SettingsLib/res/values-da/arrays.xml | 51 --- packages/SettingsLib/res/values-da/strings.xml | 86 ---- packages/SettingsLib/res/values-de/arrays.xml | 51 --- packages/SettingsLib/res/values-de/strings.xml | 86 ---- packages/SettingsLib/res/values-el/arrays.xml | 51 --- packages/SettingsLib/res/values-el/strings.xml | 86 ---- packages/SettingsLib/res/values-en-rAU/arrays.xml | 51 --- packages/SettingsLib/res/values-en-rAU/strings.xml | 86 ---- packages/SettingsLib/res/values-en-rGB/arrays.xml | 51 --- packages/SettingsLib/res/values-en-rGB/strings.xml | 86 ---- packages/SettingsLib/res/values-en-rIN/arrays.xml | 51 --- packages/SettingsLib/res/values-en-rIN/strings.xml | 86 ---- packages/SettingsLib/res/values-es-rUS/arrays.xml | 51 --- packages/SettingsLib/res/values-es-rUS/strings.xml | 86 ---- packages/SettingsLib/res/values-es/arrays.xml | 51 --- packages/SettingsLib/res/values-es/strings.xml | 86 ---- packages/SettingsLib/res/values-et-rEE/arrays.xml | 51 --- packages/SettingsLib/res/values-et-rEE/strings.xml | 86 ---- packages/SettingsLib/res/values-eu-rES/arrays.xml | 51 --- packages/SettingsLib/res/values-eu-rES/strings.xml | 86 ---- packages/SettingsLib/res/values-fa/arrays.xml | 51 --- packages/SettingsLib/res/values-fa/strings.xml | 86 ---- packages/SettingsLib/res/values-fi/arrays.xml | 51 --- packages/SettingsLib/res/values-fi/strings.xml | 86 ---- packages/SettingsLib/res/values-fr-rCA/arrays.xml | 51 --- packages/SettingsLib/res/values-fr-rCA/strings.xml | 86 ---- packages/SettingsLib/res/values-fr/arrays.xml | 51 --- packages/SettingsLib/res/values-fr/strings.xml | 86 ---- packages/SettingsLib/res/values-gl-rES/arrays.xml | 51 --- packages/SettingsLib/res/values-gl-rES/strings.xml | 86 ---- packages/SettingsLib/res/values-gu-rIN/arrays.xml | 51 --- packages/SettingsLib/res/values-gu-rIN/strings.xml | 86 ---- packages/SettingsLib/res/values-hi/arrays.xml | 51 --- packages/SettingsLib/res/values-hi/strings.xml | 86 ---- packages/SettingsLib/res/values-hr/arrays.xml | 51 --- packages/SettingsLib/res/values-hr/strings.xml | 86 ---- packages/SettingsLib/res/values-hu/arrays.xml | 51 --- packages/SettingsLib/res/values-hu/strings.xml | 86 ---- packages/SettingsLib/res/values-hy-rAM/arrays.xml | 51 --- packages/SettingsLib/res/values-hy-rAM/strings.xml | 86 ---- packages/SettingsLib/res/values-in/arrays.xml | 51 --- packages/SettingsLib/res/values-in/strings.xml | 86 ---- packages/SettingsLib/res/values-is-rIS/arrays.xml | 51 --- packages/SettingsLib/res/values-is-rIS/strings.xml | 86 ---- packages/SettingsLib/res/values-it/arrays.xml | 51 --- packages/SettingsLib/res/values-it/strings.xml | 86 ---- packages/SettingsLib/res/values-iw/arrays.xml | 51 --- packages/SettingsLib/res/values-iw/strings.xml | 86 ---- packages/SettingsLib/res/values-ja/arrays.xml | 51 --- packages/SettingsLib/res/values-ja/strings.xml | 86 ---- packages/SettingsLib/res/values-ka-rGE/arrays.xml | 51 --- packages/SettingsLib/res/values-ka-rGE/strings.xml | 86 ---- packages/SettingsLib/res/values-kk-rKZ/arrays.xml | 51 --- packages/SettingsLib/res/values-kk-rKZ/strings.xml | 86 ---- packages/SettingsLib/res/values-km-rKH/arrays.xml | 51 --- packages/SettingsLib/res/values-km-rKH/strings.xml | 86 ---- packages/SettingsLib/res/values-kn-rIN/arrays.xml | 51 --- packages/SettingsLib/res/values-kn-rIN/strings.xml | 86 ---- packages/SettingsLib/res/values-ko/arrays.xml | 51 --- packages/SettingsLib/res/values-ko/strings.xml | 86 ---- packages/SettingsLib/res/values-ky-rKG/arrays.xml | 51 --- packages/SettingsLib/res/values-ky-rKG/strings.xml | 86 ---- packages/SettingsLib/res/values-lo-rLA/arrays.xml | 51 --- packages/SettingsLib/res/values-lo-rLA/strings.xml | 86 ---- packages/SettingsLib/res/values-lt/arrays.xml | 51 --- packages/SettingsLib/res/values-lt/strings.xml | 86 ---- packages/SettingsLib/res/values-lv/arrays.xml | 51 --- packages/SettingsLib/res/values-lv/strings.xml | 86 ---- packages/SettingsLib/res/values-mk-rMK/arrays.xml | 51 --- packages/SettingsLib/res/values-mk-rMK/strings.xml | 86 ---- packages/SettingsLib/res/values-ml-rIN/arrays.xml | 51 --- packages/SettingsLib/res/values-ml-rIN/strings.xml | 86 ---- packages/SettingsLib/res/values-mn-rMN/arrays.xml | 51 --- packages/SettingsLib/res/values-mn-rMN/strings.xml | 86 ---- packages/SettingsLib/res/values-mr-rIN/arrays.xml | 51 --- packages/SettingsLib/res/values-mr-rIN/strings.xml | 86 ---- packages/SettingsLib/res/values-ms-rMY/arrays.xml | 51 --- packages/SettingsLib/res/values-ms-rMY/strings.xml | 86 ---- packages/SettingsLib/res/values-my-rMM/arrays.xml | 51 --- packages/SettingsLib/res/values-my-rMM/strings.xml | 86 ---- packages/SettingsLib/res/values-nb/arrays.xml | 51 --- packages/SettingsLib/res/values-nb/strings.xml | 86 ---- packages/SettingsLib/res/values-ne-rNP/arrays.xml | 51 --- packages/SettingsLib/res/values-ne-rNP/strings.xml | 86 ---- packages/SettingsLib/res/values-nl/arrays.xml | 51 --- packages/SettingsLib/res/values-nl/strings.xml | 86 ---- packages/SettingsLib/res/values-pa-rIN/arrays.xml | 51 --- packages/SettingsLib/res/values-pa-rIN/strings.xml | 86 ---- packages/SettingsLib/res/values-pl/arrays.xml | 51 --- packages/SettingsLib/res/values-pl/strings.xml | 86 ---- packages/SettingsLib/res/values-pt-rBR/arrays.xml | 51 --- packages/SettingsLib/res/values-pt-rBR/strings.xml | 86 ---- packages/SettingsLib/res/values-pt-rPT/arrays.xml | 51 --- packages/SettingsLib/res/values-pt-rPT/strings.xml | 86 ---- packages/SettingsLib/res/values-pt/arrays.xml | 51 --- packages/SettingsLib/res/values-pt/strings.xml | 86 ---- packages/SettingsLib/res/values-ro/arrays.xml | 51 --- packages/SettingsLib/res/values-ro/strings.xml | 86 ---- packages/SettingsLib/res/values-ru/arrays.xml | 51 --- packages/SettingsLib/res/values-ru/strings.xml | 86 ---- packages/SettingsLib/res/values-si-rLK/arrays.xml | 51 --- packages/SettingsLib/res/values-si-rLK/strings.xml | 86 ---- packages/SettingsLib/res/values-sk/arrays.xml | 51 --- packages/SettingsLib/res/values-sk/strings.xml | 86 ---- packages/SettingsLib/res/values-sl/arrays.xml | 51 --- packages/SettingsLib/res/values-sl/strings.xml | 86 ---- packages/SettingsLib/res/values-sq-rAL/arrays.xml | 51 --- packages/SettingsLib/res/values-sq-rAL/strings.xml | 86 ---- packages/SettingsLib/res/values-sr/arrays.xml | 51 --- packages/SettingsLib/res/values-sr/strings.xml | 86 ---- packages/SettingsLib/res/values-sv/arrays.xml | 51 --- packages/SettingsLib/res/values-sv/strings.xml | 86 ---- packages/SettingsLib/res/values-sw/arrays.xml | 51 --- packages/SettingsLib/res/values-sw/strings.xml | 86 ---- packages/SettingsLib/res/values-ta-rIN/arrays.xml | 51 --- packages/SettingsLib/res/values-ta-rIN/strings.xml | 86 ---- packages/SettingsLib/res/values-te-rIN/arrays.xml | 51 --- packages/SettingsLib/res/values-te-rIN/strings.xml | 86 ---- packages/SettingsLib/res/values-th/arrays.xml | 51 --- packages/SettingsLib/res/values-th/strings.xml | 86 ---- packages/SettingsLib/res/values-tl/arrays.xml | 51 --- packages/SettingsLib/res/values-tl/strings.xml | 86 ---- packages/SettingsLib/res/values-tr/arrays.xml | 51 --- packages/SettingsLib/res/values-tr/strings.xml | 86 ---- packages/SettingsLib/res/values-uk/arrays.xml | 51 --- packages/SettingsLib/res/values-uk/strings.xml | 86 ---- packages/SettingsLib/res/values-ur-rPK/arrays.xml | 51 --- packages/SettingsLib/res/values-ur-rPK/strings.xml | 86 ---- packages/SettingsLib/res/values-uz-rUZ/arrays.xml | 51 --- packages/SettingsLib/res/values-uz-rUZ/strings.xml | 86 ---- packages/SettingsLib/res/values-vi/arrays.xml | 51 --- packages/SettingsLib/res/values-vi/strings.xml | 86 ---- packages/SettingsLib/res/values-zh-rCN/arrays.xml | 51 --- packages/SettingsLib/res/values-zh-rCN/strings.xml | 86 ---- packages/SettingsLib/res/values-zh-rHK/arrays.xml | 51 --- packages/SettingsLib/res/values-zh-rHK/strings.xml | 86 ---- packages/SettingsLib/res/values-zh-rTW/arrays.xml | 51 --- packages/SettingsLib/res/values-zh-rTW/strings.xml | 86 ---- packages/SettingsLib/res/values-zu/arrays.xml | 51 --- packages/SettingsLib/res/values-zu/strings.xml | 86 ---- packages/SettingsLib/res/values/dimens.xml | 4 +- packages/SettingsLib/res/values/strings.xml | 30 ++ .../src/com/android/settingslib/AppItem.java | 85 ++++ .../android/settingslib/NetworkPolicyEditor.java | 254 ++++++++++++ .../src/com/android/settingslib/Utils.java | 84 ++++ .../settingslib/drawable/CircleFramedDrawable.java | 136 +++++++ .../src/com/android/settingslib/net/ChartData.java | 27 ++ .../android/settingslib/net/ChartDataLoader.java | 145 +++++++ .../settingslib/net/SummaryForAllUidLoader.java | 79 ++++ .../src/com/android/settingslib/net/UidDetail.java | 27 ++ .../android/settingslib/net/UidDetailProvider.java | 194 +++++++++ .../SettingsProvider/res/values-gu-rIN/strings.xml | 23 -- .../SettingsProvider/res/values-pt-rBR/strings.xml | 23 -- .../SettingsProvider/res/values-pt-rPT/strings.xml | 2 +- .../SettingsProvider/res/values-sq-rAL/strings.xml | 23 -- .../SettingsProvider/res/values-vi/strings.xml | 2 +- packages/SettingsProvider/res/values/defaults.xml | 1 + .../providers/settings/SettingsBackupAgent.java | 19 + .../providers/settings/SettingsProvider.java | 12 +- packages/Shell/res/values-az-rAZ/strings.xml | 4 +- packages/Shell/res/values-bg/strings.xml | 2 +- packages/Shell/res/values-ca/strings.xml | 2 +- packages/Shell/res/values-gu-rIN/strings.xml | 4 +- packages/Shell/res/values-hr/strings.xml | 2 +- packages/Shell/res/values-hy-rAM/strings.xml | 2 +- packages/Shell/res/values-nl/strings.xml | 4 +- packages/Shell/res/values-pl/strings.xml | 2 +- packages/Shell/res/values-pt-rBR/strings.xml | 26 -- packages/Shell/res/values-sk/strings.xml | 2 +- packages/SystemUI/res/layout/qs_detail_item.xml | 1 + packages/SystemUI/res/values-ca/strings.xml | 4 +- packages/SystemUI/res/values-cs/strings.xml | 4 +- packages/SystemUI/res/values-de/strings.xml | 60 ++- packages/SystemUI/res/values-el/strings.xml | 4 +- packages/SystemUI/res/values-es-rUS/strings.xml | 4 +- packages/SystemUI/res/values-fr-rCA/strings.xml | 4 +- packages/SystemUI/res/values-fr/strings.xml | 4 +- packages/SystemUI/res/values-gl-rES/strings.xml | 4 +- packages/SystemUI/res/values-hy-rAM/strings.xml | 6 +- packages/SystemUI/res/values-it/strings.xml | 4 +- packages/SystemUI/res/values-ja/strings.xml | 4 +- packages/SystemUI/res/values-lo-rLA/strings.xml | 2 +- packages/SystemUI/res/values-mk-rMK/strings.xml | 10 +- packages/SystemUI/res/values-ml-rIN/strings.xml | 2 +- packages/SystemUI/res/values-mr-rIN/strings.xml | 2 +- packages/SystemUI/res/values-nb/strings.xml | 4 +- packages/SystemUI/res/values-nl/strings.xml | 4 +- packages/SystemUI/res/values-pt-rBR/strings.xml | 4 +- packages/SystemUI/res/values-pt-rPT/strings.xml | 2 +- packages/SystemUI/res/values-pt/strings.xml | 4 +- packages/SystemUI/res/values-ro/strings.xml | 4 +- packages/SystemUI/res/values-ru/strings.xml | 4 +- packages/SystemUI/res/values-sk/strings.xml | 4 +- packages/SystemUI/res/values-uk/strings.xml | 2 +- packages/SystemUI/res/values-uz-rUZ/strings.xml | 12 +- packages/SystemUI/res/values-zh-rCN/strings.xml | 16 +- packages/SystemUI/res/values-zh-rHK/strings.xml | 4 +- packages/SystemUI/res/values-zh-rTW/strings.xml | 4 +- .../android/systemui/statusbar/BaseStatusBar.java | 3 +- .../systemui/statusbar/SignalClusterView.java | 54 ++- .../phone/FingerprintUnlockController.java | 2 +- .../statusbar/phone/PhoneStatusBarPolicy.java | 6 - .../systemui/statusbar/policy/HeadsUpManager.java | 8 +- .../statusbar/policy/MobileSignalController.java | 1 + .../com/android/systemui/volume/ZenModePanel.java | 11 +- .../policy/NetworkControllerBaseTest.java | 7 +- .../policy/NetworkControllerDataTest.java | 15 + packages/VpnDialogs/res/values-az-rAZ/strings.xml | 5 +- packages/VpnDialogs/res/values-nl/strings.xml | 2 +- packages/VpnDialogs/res/values-pt-rBR/strings.xml | 29 -- packages/VpnDialogs/res/values-sk/strings.xml | 2 +- .../server/backup/BackupManagerService.java | 33 +- .../java/com/android/server/AnyMotionDetector.java | 14 +- .../android/server/BluetoothManagerService.java | 3 +- .../com/android/server/ConnectivityService.java | 27 +- .../com/android/server/DeviceIdleController.java | 182 ++++++--- .../java/com/android/server/EventLogTags.logtags | 3 + .../com/android/server/LockSettingsService.java | 6 + .../core/java/com/android/server/SystemConfig.java | 25 ++ .../java/com/android/server/ThermalObserver.java | 146 +++++++ .../android/server/am/ActivityManagerService.java | 35 +- .../java/com/android/server/am/ProcessRecord.java | 8 +- .../com/android/server/audio/AudioService.java | 25 +- .../server/fingerprint/FingerprintService.java | 6 - .../server/location/GpsLocationProvider.java | 4 + .../server/net/NetworkPolicyManagerService.java | 87 ++++ .../notification/NotificationManagerService.java | 5 +- .../android/server/notification/ZenModeHelper.java | 3 +- .../server/pm/DefaultPermissionGrantPolicy.java | 25 +- .../server/policy/BurnInProtectionHelper.java | 9 +- .../android/server/policy/PhoneWindowManager.java | 18 +- .../android/server/power/PowerManagerService.java | 60 +++ .../com/android/server/wm/CircularDisplayMask.java | 2 +- .../java/com/android/server/wm/DisplayContent.java | 16 + .../com/android/server/wm/DisplaySettings.java | 11 +- .../core/java/com/android/server/wm/TaskStack.java | 9 +- .../android/server/wm/WindowManagerService.java | 38 +- services/java/com/android/server/SystemServer.java | 11 + .../android/server/usage/UsageStatsService.java | 2 +- .../com/android/server/usb/UsbDeviceManager.java | 3 +- telecomm/java/android/telecom/Call.java | 8 +- telecomm/java/android/telecom/Connection.java | 59 ++- .../java/android/telecom/ConnectionService.java | 45 +++ .../android/telecom/ConnectionServiceAdapter.java | 16 + .../telecom/ConnectionServiceAdapterServant.java | 20 + telecomm/java/android/telecom/PhoneAccount.java | 8 + .../java/android/telecom/RemoteConnection.java | 23 ++ .../android/telecom/RemoteConnectionService.java | 7 + telecomm/java/android/telecom/TelecomManager.java | 51 +++ .../internal/telecom/IConnectionService.aidl | 4 + .../telecom/IConnectionServiceAdapter.aidl | 2 + .../android/telephony/CarrierConfigManager.java | 52 ++- .../java/android/telephony/TelephonyManager.java | 40 ++ .../android/internal/telephony/PhoneConstants.java | 23 +- .../internal/telephony/TelephonyIntents.java | 23 ++ tests/UiBench/.gitignore | 5 + tests/UiBench/Android.mk | 31 ++ tests/UiBench/AndroidManifest.xml | 165 ++++++++ tests/UiBench/build.gradle | 39 ++ tests/UiBench/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 49896 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + tests/UiBench/res/drawable-nodpi/ball.jpg | Bin 0 -> 20432 bytes tests/UiBench/res/drawable-nodpi/block.jpg | Bin 0 -> 20551 bytes tests/UiBench/res/drawable-nodpi/ducky.jpg | Bin 0 -> 23838 bytes tests/UiBench/res/drawable-nodpi/frantic.jpg | Bin 0 -> 192345 bytes tests/UiBench/res/drawable-nodpi/jellies.jpg | Bin 0 -> 24368 bytes tests/UiBench/res/drawable-nodpi/large_photo.jpg | Bin 0 -> 311474 bytes tests/UiBench/res/drawable-nodpi/mug.jpg | Bin 0 -> 19839 bytes tests/UiBench/res/drawable-nodpi/pencil.jpg | Bin 0 -> 42976 bytes tests/UiBench/res/drawable-nodpi/scissors.jpg | Bin 0 -> 23209 bytes tests/UiBench/res/drawable-nodpi/woot.jpg | Bin 0 -> 36491 bytes .../UiBench/res/layout/activity_bitmap_upload.xml | 52 +++ tests/UiBench/res/layout/activity_invalidate.xml | 39 ++ tests/UiBench/res/layout/activity_transition.xml | 103 +++++ .../res/layout/activity_transition_details.xml | 39 ++ tests/UiBench/res/layout/card_row.xml | 45 +++ tests/UiBench/res/layout/invalidate_row.xml | 84 ++++ tests/UiBench/res/layout/recycler_view.xml | 21 + .../android/test/uibench/ActivityTransition.java | 118 ++++++ .../test/uibench/ActivityTransitionDetails.java | 63 +++ .../android/test/uibench/BitmapUploadActivity.java | 96 +++++ .../android/test/uibench/DialogListActivity.java | 38 ++ .../android/test/uibench/EditTextTypeActivity.java | 110 ++++++ .../test/uibench/FullscreenOverdrawActivity.java | 69 ++++ .../test/uibench/GlTextureViewActivity.java | 86 ++++ .../test/uibench/InflatingListActivity.java | 37 ++ .../android/test/uibench/InvalidateActivity.java | 88 +++++ .../src/com/android/test/uibench/MainActivity.java | 166 ++++++++ .../android/test/uibench/ShadowGridActivity.java | 45 +++ .../test/uibench/TextCacheHighHitrateActivity.java | 29 ++ .../test/uibench/TextCacheLowHitrateActivity.java | 29 ++ .../src/com/android/test/uibench/TextUtils.java | 91 +++++ .../test/uibench/TrivialAnimationActivity.java | 45 +++ .../android/test/uibench/TrivialListActivity.java | 29 ++ .../test/uibench/TrivialRecyclerViewActivity.java | 28 ++ .../test/uibench/listview/CompatListActivity.java | 39 ++ .../test/uibench/opengl/ImageFlipRenderThread.java | 389 ++++++++++++++++++ .../test/uibench/recyclerview/RvArrayAdapter.java | 64 +++ .../uibench/recyclerview/RvCompatListActivity.java | 68 ++++ tools/aapt/Command.cpp | 436 ++++++++++++++------- tools/layoutlib/.idea/encodings.xml | 7 +- .../animation/AnimatorInflater_Delegate.java | 59 --- .../src/android/content/res/BridgeResources.java | 15 +- .../src/android/content/res/BridgeTypedArray.java | 20 +- .../android/graphics/BitmapFactory_Delegate.java | 1 + .../src/android/graphics/Canvas_Delegate.java | 8 + .../src/android/graphics/FontFamily_Delegate.java | 8 +- .../src/android/graphics/Paint_Delegate.java | 72 +++- .../src/android/graphics/PathMeasure_Delegate.java | 210 ++++++++++ .../bridge/src/android/graphics/Path_Delegate.java | 79 ++-- .../drawable/GradientDrawable_Delegate.java | 73 ++++ .../android/preference/Preference_Delegate.java | 7 +- .../src/android/text/Hyphenator_Delegate.java | 5 +- .../src/android/text/StaticLayout_Delegate.java | 5 +- .../bridge/src/android/view/BridgeInflater.java | 59 ++- .../src/com/android/layoutlib/bridge/MockView.java | 77 +++- .../layoutlib/bridge/android/BridgeContext.java | 8 +- .../layoutlib/bridge/bars/AppCompatActionBar.java | 22 +- .../android/layoutlib/bridge/bars/CustomBar.java | 4 +- .../layoutlib/bridge/impl/LayoutParserWrapper.java | 377 ++++++++++++++++++ .../layoutlib/bridge/impl/ParserFactory.java | 19 +- .../layoutlib/bridge/impl/PorterDuffUtility.java | 10 +- .../layoutlib/bridge/impl/RenderSessionImpl.java | 4 - .../bridge/impl/LayoutParserWrapperTest.java | 183 +++++++++ .../android/tools/layoutlib/create/CreateInfo.java | 3 +- .../layoutlib/create/DelegateClassAdapter.java | 24 +- .../layoutlib/create/DelegateMethodAdapter.java | 8 +- .../layoutlib/create/DelegateClassAdapterTest.java | 58 +++ .../layoutlib/create/dataclass/OuterClass.java | 10 + .../OuterClass_StaticInnerClass_Delegate.java | 30 ++ 945 files changed, 12560 insertions(+), 14135 deletions(-) e16706f Backport of backup transport whitelist 5233cf8 Backport ChooserTarget package source check from N 68584d3 Don't pass URL path and username/password to PAC scripts 830665e Fix missing permission check when saving pattern/password 3df0241 Add new, hidden MotionEvent flag for partially obscured windows. d886fca [DO NOT MERGE] Disallow guest user from changing Wifi settings 66c3e63 DO NOT MERGE Add new ConnectionEvent API (hide) to send a notification to Telecom 6ccc513 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 9dcf4bc Redact Account info from getCurrentSyncs e342181 Import translations. DO NOT MERGE 577f6b8 Import translations. DO NOT MERGE 42dccd4 Hack to get devices booting again. b8bd302 Don't change screen on time on time changes 78ba120 Check apps idle states on time changes 914fc2a Don't assume kernel tick is 100Hz ef9c8be Debug logging for when getActiveNetworkInfo returns BLOCKED. 4276d40 Fix SystemUI animator leak fd0b32d Revert "Get animation update timing for AVD" 6168c07 Import translations. DO NOT MERGE 24813b0 Stop leaking Notifications when they change groupKeys. c3ebdcc Don't verify the scrollbar drawable a53c3b2 Don't verify the scrollbar drawable b3f1109 Supply content description for QS disconnect buttons 7aa4671 DO NOT MERGE Fix for syncs being dropped when appIdle is on 1bbc082 Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE] 7e8b8f1 DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE bad498f Add STEM_1, STEM_2 and STEM_3 key as wakeup keys 74dfcf9 Pulling in https://android-review.googlesource.com/#/c/186482/1 156bd49 Revert "Avoid drawable invalidation during draw()" ba9e858 Fixed a crash with the heads up manager f0ef3c1 UsageStats: Use new settings key idle_duration2 for app idle b6baaf3 Add WiFi Calling overlays for T-Mobile's MCCMNCs a5c5329 Tests for getPrimaryHorizontal with grapheme boundaries 76e9d76 UsageStats: Fix issue where initializing data for first time would cause crash 7f667e7 In CanvasContext::doFrame, make a separate call to computeFrameTimeNanos and save the result. Then pass that value to UiFrameInfoBuilder::setVsync as both arguments. 7d9fab6 Fix race condition when setting default ringtones 67b2c16 Get data type from service state as well e5e59c6 Avoid drawable invalidation during draw() ec2891b Handle null result from getVirtualChildAt() fc8e3cb Get animation update timing for AVD 5bff01d Respect grapheme clusters in Layout#getOffsetForHorizontal. 720edf9 Fix: Cursor can be at an invalid offset in EditText. 909c7bc Fix measurement to respect grapheme and span boundaries d3b2826 Add carrier config variable to support editable wfc mode 376082a Revert "Import translations. DO NOT MERGE" 8874f97 Revert "Import translations. DO NOT MERGE" 9e5fe1a Revert "Import translations. DO NOT MERGE" 9f9e736 Import translations. DO NOT MERGE a4505e9 Import translations. DO NOT MERGE f7e5202 Import translations. DO NOT MERGE da4a377 UsageStatsService: Fix app idle issue at rollover time 8d9aea8 DO NOT MERGE: Use GregorianCalendar.add() when searching for next alarm. 71921cb Fix plurals variable to unblock Translations Pipeline. 61f9f31 Fix plurals variable to unblock Translations Pipeline. 5b294b4 Exit getAllValidScorers early if not the primary. fcc57db Defines task to front/back animations in styles_micro. fd87e92 Import translations. DO NOT MERGE 24584f0 Clear calling identify b4 Beam callback. 15309a3 Remove duplicate Bluetooth profiles. 087ae47 Making ViewRootImpl drop input events when the Activity is in ambient mode. 8877120 Fix system watchdog timeout when reading too many usage events. e457fa4 Add UUID to BluetoothHeadsetClientCall b2c5155 DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 ec85f34 Add setting for declaring disabled bluetooth profiles. 8f316d2 Import translations. DO NOT MERGE 1144462f Import translations. DO NOT MERGE e0b7426 Import translations. DO NOT MERGE 648fa53 Import translations. DO NOT MERGE d2615bd Import translations. DO NOT MERGE 695cf96 Import translations. DO NOT MERGE 22dea4e Import translations. DO NOT MERGE 5f8c818 DO NOT MERGE: Fix batterystats battery level int packing 9289560 Use wakeup reason when FingerPrint sensor wakes up the device 4614596 Allow access to deprecated LOCK_PATTERN_ENABLED flag. ddb52fb DO NOT MERGE Remove more extras during notification lightening. a89f9d9 Don't back up / restore EAP network definitions 022c748 Work on issue #25467052: System lagged out ba88e68 Prevent DivideByZero error in BatteryStatsImpl 3c67873 Improve logging in BluetoothHeadsetClientCall. d8231b9 Check permissions on getDeviceId. 0b63802 Check permissions on getDeviceId. 3e57340 Fix radio button flash on hour change. 9887f2f Protect some new broadcasts. 90bc39d Check NPE beforehand instead of catching it at runtime 47268e9 Set Tether APN protocol type to IPv4 for Telus 044b8f3 Log API calls to createBond(), cancelBondProcess(), removeBond() 0a887bc DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread 8e79dae3 DO NOT MERGE Revert "MediaPlayer: Disable acquiring wakelocks based on property." e9970bc Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" ad75169 DO NOT MERGE ANYWHERE Add new interface for sensor physical data 5fdf0a1 Camera: codegen doc update 2242b4d fix data race condition BUG: 25819358 f604911 MediaPlayer: Disable acquiring wakelocks based on property. 2542f81 Import translations. DO NOT MERGE b21b778 Import translations. DO NOT MERGE 6902052 DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing bddde9b Import translations. DO NOT MERGE 6609896 Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" 65a8349 Revert "Update StaticLayout_Delegate to use new nLoadHyphenator" 8ed715e Adding StateMachine.hasMessages(), StateMachine.hasDeferredMessages() f1f45fe Don't use framework permission strings for netd permissions. 877c6c7 add lost RAM info to compact meminfo dump cac5077 Add callback for connections to be notified when the ringer is silenced. f2b9b2d Revert "Don't dispatch when non-interactive and the display is off." dd976b1 DO NOT MERGE ANYWHERE 4ea74d2 Revert "LayoutLib: Fix true transparency in status bar." 2293122 LayoutLib: IntelliJ changed project files. 99b54b3 AppCompatActionBar: use findClass to test presence f6ca46d Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE" 2b05511 WindowDecorActionBar name change fix. 05afe50 Fix MVNO hotspot bug for Europe 8d6630b DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. 211abad Log errno when dup fd cannot be allocated BUG: 25165471 f9489a4 Import translations. DO NOT MERGE 0db53d9 Add Bluetooth headset API to allow disabling audio route. 83d65fe Import translations. DO NOT MERGE 0b6e1bf Camera: Minor documentation update 333db2e DO NOT MERGE. Prevent recents from coming up when in SUW 84669ca DO NOT MERGE. Prevent recents from coming up when in SUW 6777f54 Fix delegation of methods within inner static classes 4ff8463 Initialize DisplayContent base info when object is constructed 0972c26 DO NOT MERGE. Cherrypick UiBench from Master ccbe738 Don't allow contact sharing by default for device not recognized as carkit. d30c141 Improve error reporting on Exceptions in fw views. 2f137b7 Sync extras bundle comparison can throw NPE 481a343 DO NOT MERGE ANYWHERE Use correct lock for reading/writing usage stats files 7018f60 DO NOT MERGE ANYWHERE Fix system watchdog timeout when reading too many usage events. d840727 Camera: Documentation updates 71c012e ActivityView gets its own thread pool. 07533db Don't allow contact sharing by default for device not recognized as carkit. 05ce0c6 Revert "Fix race condition when setting default ringtones" a7df771 DO NOT MERGE Ensure that the device is provisioned before showing Recents. 16a76da DO NOT MERGE Ensure that the device is provisioned before showing Recents. ead61cc Import translations. DO NOT MERGE 984f7fb Import translations. DO NOT MERGE c0f39c1 Sync extras bundle comparison can throw NPE f915991 Allow debugging only for apps forked from zygote 016d9e7 Import translations. DO NOT MERGE 49eeda3 Import translations. DO NOT MERGE 210f0af Import translations. DO NOT MERGE f2cb934 Fix race condition when setting default ringtones d9a2be8 DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE 7ecaea8 Block directory selection in openable modes. 88c7c3e Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE f131e1a Kick movement preconditions onto handler thread. e0fa747 Revert "Remove -ffast-math from libhwui makefile" c9b8f95 Fix Switch colors cf22d18 When the incoming light source is invalid, don't generate any shadow cdce35a Early return when the scale is 0. e02ec7c Remove -ffast-math from libhwui makefile f8f111f Import translations. DO NOT MERGE 492a56c Revert "Use clang for libhwui" 4c9cdbc Import translations. DO NOT MERGE 3b2a114 Import translations. DO NOT MERGE f44adbb Import translations. DO NOT MERGE 631c2ff Update StaticLayout_Delegate to use new nLoadHyphenator 0394a0c Convert ashmem bitmap thresholds to constants. 7e19e28 ActivityView gets its own thread pool. DO NOT MERGE d354fd2 Use clang for libhwui 8cee7c1 Limit persistent ashmem backed fds to a minimum of 128kB. 91fa3ba Remove auto-boxing during the inflate fcc95a6 Fix issue #25357209: Could not send SMS or MMS messages, had to reboot f149dcb Fix a crash while printing ICCID because of alphabets in UICC. b0e4f9e Fixed a bug where the panel could get stuck closing f83d778e Remove circular_display_mask_offset symbol and default 4f7883c Don't try overriding system fixed permissions on install 3ffb08a Improve comment on EXTRA_CALL_RAT_TYPE. 3b1c6e0 PackageSettingBase needs to copy volume UUID. e2ed23e Handle "uninstalled" apps when pruning app-ops. 3b0437e IMS: Support For Per-Call RAT Info 8c84217 NetworkTimeUpdateService: Grab a wakelock when manipulating system time 7bddf5a Allow verifier to grant permissions 02bffab Get rid of getTypesVisibleToCaller log spam. 5701321 UsbDeviceManager: set mUsbDataUnlocked=false on user switch c3cd7b1 Import translations. DO NOT MERGE 05738e3 Import translations. DO NOT MERGE 7611f1c Don't crash if a DHCP server doesn't send the server ID option. dc13382 Add ability to set whether audio route is allowed in BluetoothHeadsetClient 70d4210 Revert "Declare new interface for headset client bluetooth profile to query." 694251e Declare new interface for headset client bluetooth profile to query. c3b637f Import translations. DO NOT MERGE 4403602 Import translations. DO NOT MERGE 0e98ac7 Update permission label strings 3575a40 Add intent extra for determining if apps are system apps 6b3e780 Import translations. DO NOT MERGE 48dfdda Import translations. DO NOT MERGE 79c07f4 Import translations. DO NOT MERGE 7ced195 Import translations. DO NOT MERGE db2cb7b Import translations. DO NOT MERGE 30616cb Import translations. DO NOT MERGE 6b129a1 Import translations. DO NOT MERGE a1ecb9e Import translations. DO NOT MERGE c2f421a Add Telecom config bool to require a phone account to be present for handle f6e4c9d Consolidates config_windowOutsetBottom and circular_display_mask_offset c17bbe0 Add config flag for reloading supported profiles in bluetooth on enable. 9c57af4 Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on. 90814f0 Give watch Home app location permissions by default d453992 Watch dialer should have phone permission fixed c55ea66 Import translations. DO NOT MERGE a01cf41 Import translations. DO NOT MERGE be8fe13 Import translations. DO NOT MERGE 5bb1fa5 Import translations. DO NOT MERGE a400a12 Import translations. DO NOT MERGE b4dc6a3 Import translations. DO NOT MERGE 7e1d841 Import translations. DO NOT MERGE 8caa78e Import translations. DO NOT MERGE 5fafafc Import translations. DO NOT MERGE 1e7fb19 Import translations. DO NOT MERGE 91898cc Import translations. DO NOT MERGE 65855a1 Import translations. DO NOT MERGE efb0f8d Import translations. DO NOT MERGE 0705d75 Import translations. DO NOT MERGE b96d89c Add capability to identify phone accounts that are emergency only. 4f1cbad Use wear style dialog for ICC hotswap restart dialog. 2f01cf2 LayoutLib: Fix android:dependency for preferences. 979b81a Give Android Wear system apps default permission 9969f85 LayoutLib: Fix ring rendering. 4064e11 Skip drawing empty shapes to keep Apple JRE happy. 081cebf Implement Path.approximate and add PathMeasure support a186456 Safely handle interrupts during Thread.join() e5d3baf LayoutLib: Fix bitmap scaling. 024872e Fix the logging of wake time saved by Ungaze. 6777542 Retry if interrupted before mMessageThread has joined 1bd276f Don't break error string (easier grepping) 6dac0d4 Reduce the amount of allocations on Paint_Delegate e91096c Support databinding in listitem layouts. bc58f59 Add ThermalObserver system service to capture thermal state uevents. 20feaea Fix sensor usage model 57551c2 docs: fix a wrong link 1ed322b Adds an option to override RemoteViews transition. 818c379 Disable debugging for device idle in wear branch DO NOT MERGE ANYWHERE 30b0aa0 Add additional broadcast for when a phone account is unregistered. f4e1d10 Kill ActivityView's background thread when it's destroyed 6649ca3 Fix TypedArray.getTextArray() 2d80edc Add logs for the ungaze gesture. 0e766de Avoid calling scrollBy(0,0) on render d8b4785 save "retain loader" state DO NOT MERGE 2eb7d47 Manual 'cherry pick' to fix CTS tests for MediaControllerTest. e82f3c9 Allows starting window to be shown for swipe-dismiss windows. 8de564a Properly expose methods that override a non-hidden method in a hidden superclass in the API files. 2f8ac2a Fix build due to merge of duplicate variable. 2de4b74 Moving BTtraffic from experiment location to here 41e13b0 Update circular mask after display is ready. 61665cc Add some constants for Wear MNC Perms 3d2337e Cherry-pick system theme rebase to fix square UI on round watches e753361 Adds config flag for USB notification. f5bff46f Fixes cloned notification actions missing icon. efc0335 DO NOT MERGE MediaPlayer: Disable acquiring wakelocks based on property. 56ecfcc Handle KEYCODE_SOFT_SLEEP from Ungaze. b331bf9 Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze." acddf2b Do not wtf when the systemui is not present. 677adf1 Handle KEYCODE_SOFT_SLEEP from Ungaze. 93e6673 Enable debugging for device idle in wear branch DO NOT MERGE ANYWHERE 23d681b Device Idle: Android wear support 12fa3d1 Use LOCAL_MAC_ADDRESS permission in bluetoothtests. babe815 DO NOT MERGE Add 'bluetooth' user to the 'system' group. 8190168 Add capability for a connection hand rejection text response. 67322b1 Add rotary encoder input source 7535177 Fix android:theme parsing for custom views. 4eb298a LayoutLib: Fix true transparency in status bar. fe8b247 Fix AudioAttributes.usageToString() string return values f1b4814 *ring ring* Who is it? Destiny? I've been expecting your call... 30275c1 Refactor UidDetailProvider and its dependencies to SettingsLib. 49eb98e add permissions strings that have to be altered from framework originals for use in Wear BUG: 23223527 d969822 Override Body Sensors string for watches 4d0a2d2 DO NOT MERGE guard against null DimLayer instances in TaskStack BUG: 23452983 c0b99c9 Move SummaryForAllUidLoader to SettingsLib. 2aa0523 DO NOT MERGE Work around for not getting APN info in NetworkInfo object. ee93161 Add documentation for media router's palette dependency. a181770 Add a setting to enable cellular on boot. 143ebdb DO NOT MERGE Allow a custom component to handle network policy notifications 2a532f2 Add actions and extras for custom voicemail notification handling. 8d41d1d add call back intents for clearing missed calls and calling back. 8a148a3 Make sure that changes to UI in SwipeDismissLayout are on UI thread. aa4f4bf Fix doc typo for default wearable notification size. 5e4dd3e Add action for notifying custom components of missed calls. 41e6346 Don't animate burn-in return when it wasn't applied. 0b388d4 Don't animate burn-in return when it wasn't applied. f82631f Introduce permission for updating the cell broadcast content provider. 26fa501 DO NOT MERGE: Introduce stem keycodes for Wear 7bcb959 Fix BluetoothSocket file descriptor leak 0a012ba Delete overscan setting by both unique id and name. c4a4064 Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib. 9c22afe Fix a bad merge. c3d69a7 DO NOT MERGE - Fix NPE when requesting outsets for detached view. 45eb3ea Revert "Fix NPE when requesting outsets for detached view." b010291 Fix NPE when requesting outsets for detached view. 38e932b Move NetworkPolicyEditor from Settings packge to settingslib. cca5e76 Fix string breakage due to merge cff23c2f96f7dce80e3df0a1 ========platform/frameworks/minikin between android-6.0.1_r46..android-6.0.1_r54========= libs/minikin/GraphemeBreak.cpp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) 555dbae Add error logging on invalid cmap 2e98eb6 Tailor grapheme boundaries so sequence emoji are one grapheme - DO NOT MERGE ca8ac8a Reject fonts with invalid ranges in cmap 6299a6b Avoid integer overflows in parsing fonts c65e6f1 Suppress linebreaks in emoji ZWJ sequences - DO NOT MERGE adaf42f Accept variation selector in emoji sequences - DO NOT MERGE ========platform/frameworks/native between android-6.0.1_r46..android-6.0.1_r54========= cmds/atrace/atrace.cpp | 1 + cmds/dumpstate/dumpstate.c | 17 +++++++++++------ cmds/installd/commands.cpp | 23 +++++------------------ include/android/keycodes.h | 17 ++++++++++++++++- include/input/InputEventLabels.h | 9 +++++++++ include/media/openmax/OMX_Core.h | 6 +++++- include/media/openmax/OMX_VideoExt.h | 9 ++++++++- libs/binder/Parcel.cpp | 8 +++++++- services/surfaceflinger/Android.mk | 4 ++++ services/surfaceflinger/main_surfaceflinger.cpp | 7 +++++++ 10 files changed, 73 insertions(+), 28 deletions(-) e481397 Correctly handle dup() failure in Parcel::readNativeHandle 3707d7d Add new MotionEvent flag for partially obscured windows. 1e27ec5 Fix issue #27252896: Security Vulnerability -- weak binder 362ed3d BQ: fix some uninitialized variables a93a310 Add SN logging a5d2913 Sanity check IMemory access versus underlying mmap 28a83d4 BQ: Add permission check to BufferQueueConsumer::dump d983fd1 Revert "inputflinger: Initial support for rotary encoders." 2c09b78 Revert "inputflinger: Add support for scaling and true value reporting" ee03865 inputflinger: Add support for scaling and true value reporting d06421f IGraphicBufferProducer: fix QUEUE_BUFFER info leak dded8fd IGraphicBufferConsumer: fix ATTACH_BUFFER info leak 03d61d9 dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE) 8c3e55f Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" d4db70a DO NOT MERGE ANYWHERE Add new interface for sensor physical data bd65161 DO NOT MERGE: add support for new sched tracepoint 804339a Increase raft timeout to 10min so we get complete logs from older devices. 392db57 Set cpuset from surfaceflinger. 31baf8d Revert "do not dumpstate raft BUG: 24159112" 05c8622 do not dumpstate raft BUG: 24159112 72da7fb Installd: Fully decouple pre- and post-bootcomplete properties ac72bbf inputflinger: Initial support for rotary encoders. a180e85 Add KEYCODE_SOFT_SLEEP for Ungaze. bcaa8d5 OMX: clarify EOS signaling for tunneled decoders cbf4004 Bug fix in SensorManager. 8d4cb7f Dump raft logs in bugreports if they exist. e6406e3 Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors. DO NOT MERGE e6f6ad0 DO NOT MERGE. Cancel touches as well as pointer gestures. ========platform/frameworks/opt/chips between android-6.0.1_r46..android-6.0.1_r54========= res/values-az-rAZ/strings.xml | 25 ------------------------- res/values-pt-rBR/strings.xml | 25 ------------------------- res/values-ro/strings.xml | 4 ++-- sample/res/values-az-rAZ/strings.xml | 21 --------------------- sample/res/values-pt-rBR/strings.xml | 21 --------------------- 5 files changed, 2 insertions(+), 94 deletions(-) 2dcb104 Import translations. DO NOT MERGE ========platform/frameworks/opt/net/ims between android-6.0.1_r46..android-6.0.1_r54========= src/java/com/android/ims/ImsManager.java | 77 +++++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 17 deletions(-) 9510b1c Turn on IMS if it is not allowed to turn it off for current carrier 8c065f5 Add factoryReset() function to ImsManager ========platform/frameworks/opt/net/wifi between android-6.0.1_r46..android-6.0.1_r54========= .../com/android/server/wifi/WifiConfigStore.java | 128 ++++-------------- .../com/android/server/wifi/WifiController.java | 75 ++++++++--- .../java/com/android/server/wifi/WifiNative.java | 145 +++++++++++++++------ .../com/android/server/wifi/WifiServiceImpl.java | 14 ++ .../com/android/server/wifi/WifiStateMachine.java | 89 ++++++++----- 5 files changed, 255 insertions(+), 196 deletions(-) 765f850 Revert "Appropriately fail EAP-SIM/AKA when SIM doesn't generate good response" 52ba5c9 Appropriately fail EAP-SIM/AKA when SIM doesn't generate good response 1b7ed25 Revert "Appropriately fail EAP-SIM/AKA when SIM doesn't generate good response" e5048be Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE] 5492256 Guard against HAL returning null scan results fdce524 Reset idenitities for EAP-SIM networks when SIM is pulled 5ebc35f Appropriately fail EAP-SIM/AKA when SIM doesn't generate good response a9fa44d Fix issue with WiFi scan reporting e26ad45 WiFi not connecting to WiFi when screen OFF 87a5214 Avoid calling Class#getSimpleName from WifiStateMachine when not necessary. BUG: 24507822 bddf925 Fix incorrect comparator implementation leading to IllegalArgumentException. 4bb7cdf DO NOT MERGE wifi : Fix for Wi-Fi grayed out issue 459263c DO NOT MERGE Wifi: Disable PNO (if enabled) only when the scan is allowed to trigger 3c1a2b9 DO NOT MERGE Fix a crash caused by race of RSSI monitoring and connection events 1b8096e Fix a race in WifiNative objects ========platform/frameworks/opt/photoviewer between android-6.0.1_r46..android-6.0.1_r54========= res/values-az-rAZ/strings.xml | 1 - res/values-fa/strings.xml | 2 +- res/values-pt-rBR/strings.xml | 25 ------------------------- sample/res/values-pt-rBR/strings.xml | 8 -------- 4 files changed, 1 insertion(+), 35 deletions(-) f314150 Import translations. DO NOT MERGE ========platform/frameworks/opt/telephony between android-6.0.1_r46..android-6.0.1_r54========= src/java/com/android/internal/telephony/Phone.java | 7 +++++- .../com/android/internal/telephony/PhoneBase.java | 24 ++++++++++++++++++-- .../com/android/internal/telephony/PhoneProxy.java | 20 +++++++++++++++++ .../internal/telephony/PhoneSubInfoController.java | 3 +++ .../internal/telephony/cdma/CdmaCallTracker.java | 3 +++ .../telephony/cdma/CdmaServiceStateTracker.java | 4 +++- .../telephony/dataconnection/DataConnection.java | 6 +++-- .../telephony/dataconnection/DcTracker.java | 16 +++++++++++-- .../telephony/dataconnection/DcTrackerBase.java | 7 ++++-- .../telephony/dataconnection/DctController.java | 7 +----- .../telephony/gsm/GsmServiceStateTracker.java | 15 ++++++++----- .../internal/telephony/imsphone/ImsPhoneBase.java | 23 ++++++++++++++----- .../telephony/imsphone/ImsPhoneCallTracker.java | 24 +++++++++++++++----- .../android/internal/telephony/uicc/UiccCard.java | 26 +++++++++++++++++++++- 14 files changed, 152 insertions(+), 33 deletions(-) 2e60eb7 DO NOT MERGE Inform registrants of which connection started or stopped the hold tone. 509e0e4 DO NOT MERGE Send emergency call state change intent on emergency call start/end 77a4ce6 When Wi-Fi calling is available, be able to display only "Wi-Fi" 634bfdf Revert "Revert "Fix problem with cell data service after SIM swap"" 0684984 Revert "Revert "Fix problem with cell data service after SIM swap"" 1da0e30 Revert "Fix problem with cell data service after SIM swap" 39f58e3 Revert "Fix problem with cell data service after SIM swap" e61ea8c Check permissions on getDeviceId. f5bd5e9 Check permissions on getDeviceId. 79eecef Check permissions on getDeviceId. de5bdca Fix problem with cell data service after SIM swap 6238b40 Use new StateMachine apis to check if a message is pending 2df8a14 Fix to return mno dun apn when mvno is not matched 6d7e8df Fix a crash while printing ICCID because of alphabets in UICC. 2e66c63 Set WIFI icon for connection based on connection extra. fdd04d4 DO NOT MERGE ANYWHERE 3140302 Use wear style dialog for ICC hotswap restart dialog. 4c3aa35 roamingProtocol should be used for roaming. 32cefb7 DO NOT MERGE Change auth_type value to 0 if AUTH_TYPE is -1 3658b47 Do not turn on cellular radio if enable_cellular_on_boot is false. ========platform/frameworks/rs between android-6.0.1_r46..android-6.0.1_r54========= cpp/rsDispatch.cpp | 158 ++++++++++++++++++++++++++--------------------------- 1 file changed, 79 insertions(+), 79 deletions(-) 53c51af Enable error logcat for rsDispatch. ========platform/frameworks/support between android-6.0.1_r46..android-6.0.1_r54========= .gitignore | 2 + Android.mk | 7 + apicheck.mk | 3 + build.gradle | 16 +- customtabs/api/{23.txt => 23.0.0.txt} | 0 customtabs/api/23.1.0.txt | 88 + customtabs/api/current.txt | 8 + .../support/customtabs/CustomTabsCallback.java | 10 + .../support/customtabs/CustomTabsIntent.java | 36 +- .../support/customtabs/CustomTabsService.java | 19 +- .../support/customtabs/CustomTabsSession.java | 25 +- .../support/customtabs/ICustomTabsService.aidl | 1 + design/Android.mk | 55 +- design/api/{23.txt => 23.0.0.txt} | 0 design/api/23.1.0.txt | 420 +++ design/api/current.txt | 103 +- .../support/design/widget/AnimationUtils.java | 4 + .../design/widget/CircularBorderDrawable.java | 55 +- .../design/widget/FloatingActionButtonImpl.java | 114 +- .../design/widget/ShadowDrawableWrapper.java | 14 + .../support/design/widget/ShadowViewDelegate.java | 1 + .../support/design/widget/StateListAnimator.java | 5 +- .../support/design/widget/ValueAnimatorCompat.java | 5 + .../design/widget/VisibilityAwareImageButton.java | 55 + design/build.gradle | 70 +- .../widget/FloatingActionButtonEclairMr1.java | 89 +- .../widget/ValueAnimatorCompatImplEclairMr1.java | 5 + .../widget/FloatingActionButtonHoneycombMr1.java | 97 - .../ValueAnimatorCompatImplHoneycombMr1.java | 5 + .../design/widget/FloatingActionButtonIcs.java | 149 + .../widget/CircularBorderDrawableLollipop.java | 55 +- .../widget/FloatingActionButtonLollipop.java | 105 +- design/proguard-rules.pro | 3 + design/res-public/values/public_attrs.xml | 5 + design/res/layout/design_layout_tab_icon.xml | 6 +- design/res/layout/design_menu_item_action_area.xml | 19 + design/res/layout/design_navigation_item.xml | 6 +- .../res/layout/design_navigation_item_header.xml | 1 + design/res/layout/design_navigation_menu.xml | 5 +- design/res/layout/design_navigation_menu_item.xml | 36 + design/res/values-sw600dp/dimens.xml | 2 +- design/res/values/attrs.xml | 28 +- design/res/values/dimens.xml | 6 +- design/res/values/strings.xml | 2 + design/res/values/styles.xml | 10 +- .../design/internal/ForegroundLinearLayout.java | 229 ++ .../support/design/internal/NavigationMenu.java | 6 +- .../design/internal/NavigationMenuItemView.java | 60 +- .../design/internal/NavigationMenuPresenter.java | 330 +- .../design/internal/NavigationMenuView.java | 10 +- .../support/design/internal/NavigationSubMenu.java | 39 +- .../design/internal/ParcelableSparseArray.java | 78 + .../support/design/widget/AppBarLayout.java | 568 ++-- .../support/design/widget/BottomSheetBehavior.java | 417 +++ .../design/widget/CollapsingTextHelper.java | 130 +- .../design/widget/CollapsingToolbarLayout.java | 280 +- .../support/design/widget/CoordinatorLayout.java | 140 +- .../support/design/widget/DrawableUtils.java | 99 + .../design/widget/FloatingActionButton.java | 296 +- .../support/design/widget/HeaderBehavior.java | 310 ++ .../design/widget/HeaderScrollingViewBehavior.java | 92 + .../support/design/widget/NavigationView.java | 42 +- .../android/support/design/widget/Snackbar.java | 100 +- .../support/design/widget/SnackbarManager.java | 32 +- .../design/widget/SwipeDismissBehavior.java | 19 +- .../android/support/design/widget/TabLayout.java | 606 +++- .../support/design/widget/TextInputLayout.java | 445 ++- .../android/support/design/widget/ThemeUtils.java | 38 + .../support/design/widget/ViewOffsetHelper.java | 6 +- graphics/drawable/Android.mk | 9 +- .../drawable/AnimatedVectorDrawableCompat.java | 15 +- .../support/graphics/drawable/PathParser.java | 33 +- .../graphics/drawable/VectorDrawableCompat.java | 212 +- graphics/drawable/testanimated/Android.mk | 6 +- .../animation_vector_drawable_grouping_1.xml | 11 +- .../res/drawable/animation_vector_progress_bar.xml | 11 +- .../res/drawable/vector_drawable_grouping_1.xml | 43 +- .../res/drawable/vector_drawable_progress_bar.xml | 51 +- graphics/drawable/teststatic/Android.mk | 5 +- graphics/drawable/teststatic/AndroidManifest.xml | 4 +- .../teststatic/res/drawable/vector_drawable01.xml | 23 +- .../teststatic/res/drawable/vector_drawable02.xml | 35 +- .../teststatic/res/drawable/vector_drawable03.xml | 61 +- .../teststatic/res/drawable/vector_drawable04.xml | 47 +- .../teststatic/res/drawable/vector_drawable05.xml | 23 +- .../teststatic/res/drawable/vector_drawable06.xml | 59 +- .../teststatic/res/drawable/vector_drawable07.xml | 13 +- .../teststatic/res/drawable/vector_drawable08.xml | 17 +- .../teststatic/res/drawable/vector_drawable09.xml | 21 +- .../teststatic/res/drawable/vector_drawable10.xml | 33 +- .../teststatic/res/drawable/vector_drawable11.xml | 25 +- .../teststatic/res/drawable/vector_drawable12.xml | 113 +- .../teststatic/res/drawable/vector_drawable13.xml | 29 +- .../teststatic/res/drawable/vector_drawable14.xml | 25 +- .../teststatic/res/drawable/vector_drawable15.xml | 25 +- .../teststatic/res/drawable/vector_drawable16.xml | 43 +- .../teststatic/res/drawable/vector_drawable17.xml | 17 +- .../teststatic/res/drawable/vector_drawable18.xml | 19 +- .../teststatic/res/drawable/vector_drawable19.xml | 23 +- .../teststatic/res/drawable/vector_drawable20.xml | 19 +- .../teststatic/res/drawable/vector_drawable21.xml | 43 +- .../teststatic/res/drawable/vector_drawable22.xml | 69 +- .../teststatic/res/drawable/vector_drawable23.xml | 87 +- .../teststatic/res/drawable/vector_drawable24.xml | 87 +- .../teststatic/res/drawable/vector_drawable25.xml | 79 +- .../teststatic/res/drawable/vector_drawable26.xml | 39 +- .../teststatic/res/drawable/vector_drawable27.xml | 39 +- .../teststatic/res/drawable/vector_drawable28.xml | 41 +- .../teststatic/res/drawable/vector_drawable29.xml | 15 +- .../teststatic/res/drawable/vector_drawable30.xml | 15 +- .../res/drawable/vector_drawable_scale0.xml | 57 + .../res/drawable/vector_drawable_scale1.xml | 52 + .../res/drawable/vector_drawable_scale2.xml | 48 + .../res/drawable/vector_drawable_scale3.xml | 62 + .../teststatic/res/drawable/vector_test01.xml | 31 + .../teststatic/res/drawable/vector_test02.xml | 31 + graphics/drawable/teststatic/res/values/colors.xml | 20 + .../drawable/teststatic/res/values/strings.xml | 3 +- .../support/test/vectordrawable/TestActivity.java | 12 +- .../graphics/drawable/AndroidResources.java | 82 + .../support/graphics/drawable/TypedArrayUtils.java | 67 + local.properties | 12 +- percent/Android.mk | 2 +- percent/AndroidManifest.xml | 2 +- percent/api/{23.txt => 23.0.0.txt} | 0 percent/api/23.1.0.txt | 65 + percent/api/current.txt | 1 + percent/build.gradle | 67 + percent/res/values/attrs.xml | 1 + .../support/percent/PercentFrameLayout.java | 19 +- .../support/percent/PercentLayoutHelper.java | 31 + .../support/percent/PercentRelativeLayout.java | 19 +- recommendation/api/{23.txt => 23.0.0.txt} | 0 recommendation/api/23.1.0.txt | 132 + recommendation/build.gradle | 15 +- .../app/recommendation/ContentRecommendation.java | 6 +- scripts/support-deps-license.sh | 50 + settings.gradle | 3 + v13/api/{23.txt => 23.0.0.txt} | 0 v13/api/23.1.0.txt | 38 + v14/preference/NOTICES.md | 11 + v14/preference/api/{23.txt => 23.0.0.txt} | 0 v14/preference/api/23.1.0.txt | 94 + v14/preference/api/current.txt | 3 +- v14/preference/build.gradle | 34 + .../drawable/preference_list_divider_material.xml | 24 + .../layout-v17/preference_information_material.xml | 2 +- .../res/layout-v17/preference_material.xml | 4 +- .../res/layout-v21/preference_material.xml | 2 +- .../res/layout/preference_information_material.xml | 2 +- v14/preference/res/layout/preference_material.xml | 4 +- .../preference/res/values-v17/styles.xml | 6 +- v14/preference/res/values/attrs.xml | 39 +- v14/preference/res/values/styles.xml | 47 +- v14/preference/res/values/themes.xml | 4 + .../EditTextPreferenceDialogFragment.java | 33 +- .../support/v14/preference/PreferenceFragment.java | 138 +- v17/leanback/.classpath | 9 +- v17/leanback/Android.mk | 25 +- v17/leanback/api/{23.txt => 23.0.0.txt} | 0 v17/leanback/api/23.1.0.txt | 1796 ++++++++++ v17/leanback/api/current.txt | 370 +- .../v17/leanback/transition/FadeAndShortSlide.java | 211 ++ .../leanback/transition/TransitionHelperApi21.java | 30 + .../transition/TranslationAnimationCreator.java | 128 + .../leanback/widget/RoundedRectHelperApi21.java | 40 +- .../v17/leanback/widget/ShadowHelperApi21.java | 19 +- .../v17/leanback/widget/ForegroundHelperApi23.java | 35 + v17/leanback/build.gradle | 4 +- .../leanback/transition/TransitionListener.java | 10 + v17/leanback/generatev4.py | 16 +- .../transition/TransitionHelperKitkat.java | 22 +- v17/leanback/project.properties | 2 +- v17/leanback/res/animator/lb_guidance_entry.xml | 54 - .../res/animator/lb_guidedactions_entry.xml | 53 - .../animator/lb_guidedactions_selector_hide.xml | 1 - .../animator/lb_guidedactions_selector_show.xml | 1 - ..._unchecked.xml => lb_guidedstep_slide_down.xml} | 6 +- .../animator/lb_guidedstep_slide_in_from_end.xml | 34 - .../animator/lb_guidedstep_slide_in_from_start.xml | 34 - .../animator/lb_guidedstep_slide_out_to_end.xml | 34 - .../animator/lb_guidedstep_slide_out_to_start.xml | 34 - ...item_checked.xml => lb_guidedstep_slide_up.xml} | 6 +- .../res/drawable/lb_headers_right_fading.xml | 2 +- .../res/layout/lb_fullwidth_details_overview.xml | 3 +- v17/leanback/res/layout/lb_guidedactions.xml | 38 +- v17/leanback/res/layout/lb_guidedactions_item.xml | 7 +- .../res/layout/lb_guidedstep_background.xml | 24 + v17/leanback/res/layout/lb_guidedstep_fragment.xml | 62 +- v17/leanback/res/layout/lb_image_card_view.xml | 63 +- .../lb_image_card_view_themed_badge_left.xml | 23 + .../lb_image_card_view_themed_badge_right.xml | 23 + .../layout/lb_image_card_view_themed_content.xml | 20 + .../res/layout/lb_image_card_view_themed_title.xml | 20 + v17/leanback/res/layout/lb_search_fragment.xml | 3 +- .../lb_browse_entrance_transition.xml | 2 +- .../transition-v21/lb_browse_return_transition.xml | 4 +- .../lb_guidedstep_activity_enter.xml | 53 + .../lb_vertical_grid_enter_transition.xml | 22 + .../lb_vertical_grid_entrance_transition.xml} | 8 +- .../lb_vertical_grid_return_transition.xml} | 19 +- v17/leanback/res/values-af/strings.xml | 2 + v17/leanback/res/values-am/strings.xml | 2 + v17/leanback/res/values-ar/strings.xml | 2 + v17/leanback/res/values-az-rAZ/strings.xml | 2 + v17/leanback/res/values-bg/strings.xml | 2 + v17/leanback/res/values-bn-rBD/strings.xml | 2 + v17/leanback/res/values-ca/strings.xml | 2 + v17/leanback/res/values-cs/strings.xml | 2 + v17/leanback/res/values-da/strings.xml | 2 + v17/leanback/res/values-de/strings.xml | 2 + v17/leanback/res/values-el/strings.xml | 2 + v17/leanback/res/values-en-rAU/strings.xml | 2 + v17/leanback/res/values-en-rGB/strings.xml | 2 + v17/leanback/res/values-en-rIN/strings.xml | 2 + v17/leanback/res/values-es-rUS/strings.xml | 2 + v17/leanback/res/values-es/strings.xml | 2 + v17/leanback/res/values-et-rEE/strings.xml | 2 + v17/leanback/res/values-eu-rES/strings.xml | 2 + v17/leanback/res/values-fa/strings.xml | 2 + v17/leanback/res/values-fi/strings.xml | 2 + v17/leanback/res/values-fr-rCA/strings.xml | 2 + v17/leanback/res/values-fr/strings.xml | 2 + v17/leanback/res/values-gl-rES/strings.xml | 2 + v17/leanback/res/values-gu-rIN/strings.xml | 2 + v17/leanback/res/values-hi/strings.xml | 2 + v17/leanback/res/values-hr/strings.xml | 2 + v17/leanback/res/values-hu/strings.xml | 2 + v17/leanback/res/values-hy-rAM/strings.xml | 2 + v17/leanback/res/values-in/strings.xml | 2 + v17/leanback/res/values-is-rIS/strings.xml | 2 + v17/leanback/res/values-it/strings.xml | 2 + v17/leanback/res/values-iw/strings.xml | 2 + v17/leanback/res/values-ja/strings.xml | 2 + v17/leanback/res/values-ka-rGE/strings.xml | 2 + v17/leanback/res/values-kk-rKZ/strings.xml | 2 + v17/leanback/res/values-km-rKH/strings.xml | 2 + v17/leanback/res/values-kn-rIN/strings.xml | 2 + v17/leanback/res/values-ko/strings.xml | 2 + v17/leanback/res/values-ky-rKG/strings.xml | 2 + v17/leanback/res/values-ldrtl/integers.xml | 24 + v17/leanback/res/values-lo-rLA/strings.xml | 2 + v17/leanback/res/values-lt/strings.xml | 2 + v17/leanback/res/values-lv/strings.xml | 2 + v17/leanback/res/values-mk-rMK/strings.xml | 2 + v17/leanback/res/values-ml-rIN/strings.xml | 2 + v17/leanback/res/values-mn-rMN/strings.xml | 2 + v17/leanback/res/values-mr-rIN/strings.xml | 2 + v17/leanback/res/values-ms-rMY/strings.xml | 2 + v17/leanback/res/values-my-rMM/strings.xml | 2 + v17/leanback/res/values-nb/strings.xml | 2 + v17/leanback/res/values-ne-rNP/strings.xml | 2 + v17/leanback/res/values-nl/strings.xml | 2 + v17/leanback/res/values-pa-rIN/strings.xml | 2 + v17/leanback/res/values-pl/strings.xml | 2 + v17/leanback/res/values-pt-rBR/strings.xml | 2 + v17/leanback/res/values-pt-rPT/strings.xml | 2 + v17/leanback/res/values-pt/strings.xml | 2 + v17/leanback/res/values-ro/strings.xml | 2 + v17/leanback/res/values-ru/strings.xml | 2 + v17/leanback/res/values-si-rLK/strings.xml | 2 + v17/leanback/res/values-sk/strings.xml | 2 + v17/leanback/res/values-sl/strings.xml | 2 + v17/leanback/res/values-sq-rAL/strings.xml | 2 + v17/leanback/res/values-sr/strings.xml | 2 + v17/leanback/res/values-sv/strings.xml | 2 + v17/leanback/res/values-sw/strings.xml | 2 + v17/leanback/res/values-ta-rIN/strings.xml | 4 +- v17/leanback/res/values-te-rIN/strings.xml | 2 + v17/leanback/res/values-th/strings.xml | 2 + v17/leanback/res/values-tl/strings.xml | 2 + v17/leanback/res/values-tr/strings.xml | 2 + v17/leanback/res/values-uk/strings.xml | 2 + v17/leanback/res/values-ur-rPK/strings.xml | 2 + v17/leanback/res/values-uz-rUZ/strings.xml | 2 + v17/leanback/res/values-v19/themes.xml | 1 + v17/leanback/res/values-v21/themes.xml | 2 + v17/leanback/res/values-v22/integers.xml | 24 + v17/leanback/res/values-vi/strings.xml | 2 + v17/leanback/res/values-zh-rCN/strings.xml | 2 + v17/leanback/res/values-zh-rHK/strings.xml | 2 + v17/leanback/res/values-zh-rTW/strings.xml | 2 + v17/leanback/res/values-zu/strings.xml | 2 + v17/leanback/res/values/attrs.xml | 103 +- v17/leanback/res/values/colors.xml | 2 + v17/leanback/res/values/dimens.xml | 16 +- v17/leanback/res/values/ids.xml | 12 +- v17/leanback/res/values/integers.xml | 7 + v17/leanback/res/values/strings.xml | 4 + v17/leanback/res/values/styles.xml | 105 +- v17/leanback/res/values/themes.xml | 36 +- .../animation/UntargetableAnimatorSet.java | 131 - .../support/v17/leanback/app/BaseFragment.java | 4 +- .../v17/leanback/app/BaseSupportFragment.java | 4 +- .../support/v17/leanback/app/BrowseFragment.java | 17 +- .../v17/leanback/app/BrowseSupportFragment.java | 17 +- .../support/v17/leanback/app/DetailsFragment.java | 21 +- .../v17/leanback/app/DetailsSupportFragment.java | 21 +- .../v17/leanback/app/GuidedActionAdapter.java | 266 +- .../v17/leanback/app/GuidedActionAdapterGroup.java | 188 ++ .../v17/leanback/app/GuidedStepFragment.java | 857 ++++- .../leanback/app/GuidedStepSupportFragment.java | 1110 ++++++ .../support/v17/leanback/app/HeadersFragment.java | 22 +- .../v17/leanback/app/HeadersSupportFragment.java | 22 +- .../v17/leanback/app/PlaybackControlGlue.java | 2 +- .../leanback/app/PlaybackControlSupportGlue.java | 858 +++++ .../support/v17/leanback/app/RowsFragment.java | 4 + .../v17/leanback/app/RowsSupportFragment.java | 4 + .../support/v17/leanback/app/SearchFragment.java | 12 + .../v17/leanback/app/SearchSupportFragment.java | 12 + .../v17/leanback/app/VerticalGridFragment.java | 30 +- .../leanback/app/VerticalGridSupportFragment.java | 30 +- .../transition/LeanbackTransitionHelper.java | 24 +- .../v17/leanback/transition/TransitionHelper.java | 360 +- .../support/v17/leanback/widget/BaseCardView.java | 9 + .../support/v17/leanback/widget/BaseGridView.java | 3 +- .../v17/leanback/widget/CheckableImageView.java | 69 + .../widget/DetailsOverviewSharedElementHelper.java | 7 +- .../v17/leanback/widget/FocusHighlightHelper.java | 15 +- .../v17/leanback/widget/ForegroundHelper.java | 78 + .../leanback/widget/FragmentAnimationProvider.java | 40 +- .../FullWidthDetailsOverviewRowPresenter.java | 27 +- ...ullWidthDetailsOverviewSharedElementHelper.java | 10 +- .../v17/leanback/widget/GridLayoutManager.java | 150 +- .../v17/leanback/widget/GuidanceStylist.java | 76 +- .../support/v17/leanback/widget/GuidedAction.java | 422 ++- .../v17/leanback/widget/GuidedActionEditText.java | 58 + .../v17/leanback/widget/GuidedActionsStylist.java | 607 ++-- .../support/v17/leanback/widget/ImageCardView.java | 289 +- .../support/v17/leanback/widget/ImeKeyMonitor.java | 47 + .../v17/leanback/widget/ItemBridgeAdapter.java | 7 +- .../ItemBridgeAdapterShadowOverlayWrapper.java | 44 + .../v17/leanback/widget/ListRowPresenter.java | 119 +- .../leanback/widget/PlaybackControlsPresenter.java | 2 +- .../v17/leanback/widget/RoundedRectHelper.java | 29 +- .../support/v17/leanback/widget/RowPresenter.java | 17 +- .../support/v17/leanback/widget/SearchBar.java | 14 +- .../support/v17/leanback/widget/ShadowHelper.java | 13 +- .../leanback/widget/ShadowOverlayContainer.java | 215 +- .../v17/leanback/widget/ShadowOverlayHelper.java | 467 +++ .../v17/leanback/widget/StaticShadowHelper.java | 11 +- .../support/v17/leanback/widget/TitleHelper.java | 14 +- .../v17/leanback/widget/VerticalGridPresenter.java | 106 +- v17/preference-leanback/Android.mk | 10 +- v17/preference-leanback/api/{23.txt => 23.0.0.txt} | 0 v17/preference-leanback/api/23.1.0.txt | 61 + ...ackPreferenceFragmentTransitionHelperApi21.java | 285 +- v17/preference-leanback/build.gradle | 34 + .../lb_preference_item_primary_text_color.xml | 21 + .../lb_preference_item_secondary_text_color.xml | 21 + .../layout/leanback_list_preference_fragment.xml | 9 +- .../layout/leanback_list_preference_item_multi.xml | 35 +- .../leanback_list_preference_item_single.xml | 35 +- .../res/layout/leanback_preference.xml | 74 + .../res/layout/leanback_preference_category.xml | 33 + .../res/layout/leanback_preference_fragment.xml | 8 +- .../res/layout/leanback_preference_information.xml | 61 + .../res/layout/leanback_preferences_list.xml | 3 +- v17/preference-leanback/res/values/colors.xml | 7 + v17/preference-leanback/res/values/dimens.xml | 28 +- v17/preference-leanback/res/values/styles.xml | 74 + v17/preference-leanback/res/values/themes.xml | 33 + .../LeanbackListPreferenceDialogFragment.java | 26 +- v17/tests/AndroidManifest.xml | 12 +- v17/tests/generatev4.py | 78 + v17/tests/res/layout/browse.xml | 28 + .../v17/leanback/app/BrowseFragmentTest.java | 93 + .../leanback/app/BrowseFragmentTestActivity.java | 58 + .../leanback/app/BrowseSupportFragmentTest.java | 95 + .../app/BrowseSupportFragmentTestActivity.java | 60 + .../v17/leanback/app/BrowseTestFragment.java | 126 + .../leanback/app/BrowseTestSupportFragment.java | 128 + .../support/v17/leanback/app/StringPresenter.java | 51 + .../support/v17/leanback/widget/GridActivity.java | 7 +- .../v17/leanback/widget/GridWidgetTest.java | 110 +- .../widget/ShadowOverlayContainerTest.java | 106 + v4/Android.mk | 58 +- v4/api/{23.txt => 23.0.0.txt} | 0 v4/api/23.1.0.txt | 3520 ++++++++++++++++++++ v4/api/current.txt | 178 +- v4/api21/android/content/pm/ParceledListSlice.java | 70 + .../service/media/IMediaBrowserService.java | 65 + .../media/IMediaBrowserServiceCallbacks.java | 91 + .../android/support/v4/app/ActivityCompat21.java | 5 + .../graphics/drawable/DrawableCompatLollipop.java | 42 +- .../graphics/drawable/DrawableWrapperLollipop.java | 52 + .../support/v4/media/MediaBrowserCompatApi21.java | 153 + .../v4/media/MediaBrowserServiceCompatApi21.java | 165 + .../v4/media/MediaDescriptionCompatApi21.java | 4 +- .../support/v4/media/MediaMetadataCompatApi21.java | 9 + .../v4/media/session/MediaSessionCompatApi21.java | 2 +- .../v4/graphics/drawable/DrawableCompatApi22.java | 4 +- .../support/v4/app/AppOpsManagerCompat23.java | 2 +- .../support/v4/content/ResourcesCompatApi23.java | 33 + .../support/v4/media/MediaBrowserCompatApi23.java | 57 + .../v4/media/MediaBrowserServiceCompatApi23.java | 86 + .../android/support/v4/text/ICUCompatApi23.java | 2 +- .../support/v4/view/ViewCompatMarshmallow.java | 33 + .../support/v4/widget/TextViewCompatApi23.java | 27 + v4/build.gradle | 25 + .../support/v4/animation/ValueAnimatorCompat.java | 2 +- .../v4/graphics/drawable/DrawableCompatBase.java | 6 +- .../v4/graphics/drawable/DrawableWrapper.java | 6 +- .../v4/graphics/drawable/DrawableWrapperDonut.java | 52 +- .../v4/media/session/MediaSessionCompatApi8.java | 2 +- .../v4/widget/ScrollerCompatGingerbread.java | 5 + .../v4/content/ExecutorCompatHoneycomb.java | 31 + .../android/support/v4/view/ViewCompatICSMr1.java | 32 + .../v4/media/session/MediaSessionCompatApi14.java | 4 +- .../support/v4/view/ViewParentCompatICS.java | 2 +- .../support/v4/animation/AnimatorCompatHelper.java | 11 +- .../android/support/v4/app/FragmentActivity.java | 36 + .../android/support/v4/app/FragmentManager.java | 65 +- .../android/support/v4/app/NotificationCompat.java | 2 +- .../android/support/v4/content/ContextCompat.java | 4 +- .../support/v4/content/ParallelExecutorCompat.java | 36 + .../support/v4/content/res/ResourcesCompat.java | 89 +- .../android/support/v4/graphics/ColorUtils.java | 40 +- .../v4/graphics/drawable/DrawableCompat.java | 2 +- .../support/v4/media/MediaBrowserCompat.java | 1243 +++++++ .../support/v4/media/MediaBrowserProtocol.java | 126 + .../v4/media/MediaBrowserServiceCompat.java | 803 +++++ .../support/v4/media/MediaMetadataCompat.java | 79 +- .../v4/media/session/MediaButtonReceiver.java | 129 + .../v4/media/session/MediaControllerCompat.java | 16 +- .../v4/media/session/MediaSessionCompat.java | 93 +- v4/java/android/support/v4/os/IResultReceiver.aidl | 24 + v4/java/android/support/v4/os/ResultReceiver.aidl | 19 + v4/java/android/support/v4/os/ResultReceiver.java | 143 + .../android/support/v4/view/ActionProvider.java | 57 + v4/java/android/support/v4/view/PagerAdapter.java | 14 +- .../android/support/v4/view/PagerTitleStrip.java | 34 +- v4/java/android/support/v4/view/ViewCompat.java | 198 +- v4/java/android/support/v4/view/ViewPager.java | 84 +- .../android/support/v4/widget/DrawerLayout.java | 194 +- .../support/v4/widget/NestedScrollView.java | 110 +- .../android/support/v4/widget/ScrollerCompat.java | 31 + .../support/v4/widget/SwipeRefreshLayout.java | 160 +- .../android/support/v4/widget/TextViewCompat.java | 90 +- .../support/v4/widget/TextViewCompatDonut.java | 98 + .../v4/text/TextUtilsCompatJellybeanMr1.java | 2 +- .../v4/media/TransportMediatorJellybeanMR2.java | 33 +- .../v4/media/session/MediaSessionCompatApi18.java | 38 +- .../support/v4/widget/TextViewCompatJb.java | 31 + .../v4/media/session/MediaSessionCompatApi19.java | 3 +- .../v4/view/ViewPropertyAnimatorCompatKK.java | 16 +- v4/tests/AndroidManifest.xml | 32 + .../support/v4/graphics/ColorUtilsTest.java | 76 +- .../android/support/v4/widget/TestActivity.java | 35 + .../support/v4/widget/TextViewCompatTest.java | 79 + .../v4/widget/test/TextViewTestActivity.java | 24 + v7/appcompat/api/{23.txt => 23.0.0.txt} | 0 v7/appcompat/api/23.1.0.txt | 2081 ++++++++++++ v7/appcompat/api/current.txt | 63 +- v7/appcompat/res-public/values/public_attrs.xml | 3 +- v7/appcompat/res-public/values/public_styles.xml | 2 + .../abc_scrubber_control_off_mtrl_alpha.png | Bin 0 -> 228 bytes .../abc_scrubber_control_to_pressed_mtrl_000.png | Bin 0 -> 217 bytes .../abc_scrubber_control_to_pressed_mtrl_005.png | Bin 0 -> 329 bytes .../abc_scrubber_primary_mtrl_alpha.9.png | Bin 0 -> 109 bytes .../abc_scrubber_track_mtrl_alpha.9.png | Bin 0 -> 105 bytes .../abc_switch_track_mtrl_alpha.9.png | Bin 315 -> 370 bytes .../abc_scrubber_control_off_mtrl_alpha.png | Bin 0 -> 173 bytes .../abc_scrubber_control_to_pressed_mtrl_000.png | Bin 0 -> 171 bytes .../abc_scrubber_control_to_pressed_mtrl_005.png | Bin 0 -> 221 bytes .../abc_scrubber_primary_mtrl_alpha.9.png | Bin 0 -> 106 bytes .../abc_scrubber_track_mtrl_alpha.9.png | Bin 0 -> 100 bytes .../abc_switch_track_mtrl_alpha.9.png | Bin 238 -> 269 bytes .../abc_scrubber_control_off_mtrl_alpha.png | Bin 0 -> 330 bytes .../abc_scrubber_control_to_pressed_mtrl_000.png | Bin 0 -> 324 bytes .../abc_scrubber_control_to_pressed_mtrl_005.png | Bin 0 -> 468 bytes .../abc_scrubber_primary_mtrl_alpha.9.png | Bin 0 -> 119 bytes .../abc_scrubber_track_mtrl_alpha.9.png | Bin 0 -> 114 bytes .../abc_switch_track_mtrl_alpha.9.png | Bin 419 -> 499 bytes .../abc_scrubber_control_off_mtrl_alpha.png | Bin 0 -> 396 bytes .../abc_scrubber_control_to_pressed_mtrl_000.png | Bin 0 -> 476 bytes .../abc_scrubber_control_to_pressed_mtrl_005.png | Bin 0 -> 738 bytes .../abc_scrubber_primary_mtrl_alpha.9.png | Bin 0 -> 155 bytes .../abc_scrubber_track_mtrl_alpha.9.png | Bin 0 -> 204 bytes .../abc_switch_track_mtrl_alpha.9.png | Bin 589 -> 734 bytes .../abc_scrubber_control_to_pressed_mtrl_000.png | Bin 0 -> 515 bytes .../abc_scrubber_control_to_pressed_mtrl_005.png | Bin 0 -> 818 bytes .../abc_switch_track_mtrl_alpha.9.png | Bin 532 -> 710 bytes .../res/drawable/abc_seekbar_thumb_material.xml | 35 + .../res/drawable/abc_seekbar_track_material.xml | 40 + .../res/layout/abc_action_menu_item_layout.xml | 2 +- v7/appcompat/res/layout/abc_action_mode_bar.xml | 2 +- .../layout/abc_action_mode_close_item_material.xml | 20 +- .../res/layout/abc_activity_chooser_view.xml | 2 +- .../abc_alert_dialog_button_bar_material.xml | 59 + .../res/layout/abc_alert_dialog_material.xml | 57 +- .../res/layout/abc_dialog_title_material.xml | 4 +- .../res/layout/abc_expanded_menu_layout.xml | 2 +- .../res/layout/abc_list_menu_item_layout.xml | 4 +- .../res/layout/abc_popup_menu_item_layout.xml | 4 +- .../res/layout/abc_screen_content_include.xml | 2 +- v7/appcompat/res/layout/abc_screen_simple.xml | 6 +- .../abc_screen_simple_overlay_action_mode.xml | 6 +- v7/appcompat/res/layout/abc_screen_toolbar.xml | 10 +- .../abc_search_dropdown_item_icons_2line.xml | 6 +- v7/appcompat/res/layout/abc_search_view.xml | 10 +- .../layout/select_dialog_multichoice_material.xml | 26 +- .../layout/select_dialog_singlechoice_material.xml | 26 +- v7/appcompat/res/values-af/strings.xml | 2 + v7/appcompat/res/values-am/strings.xml | 2 + v7/appcompat/res/values-ar/strings.xml | 2 + v7/appcompat/res/values-az-rAZ/strings.xml | 2 + v7/appcompat/res/values-bg/strings.xml | 2 + v7/appcompat/res/values-bn-rBD/strings.xml | 2 + v7/appcompat/res/values-ca/strings.xml | 2 + v7/appcompat/res/values-cs/strings.xml | 2 + v7/appcompat/res/values-da/strings.xml | 2 + v7/appcompat/res/values-de/strings.xml | 2 + v7/appcompat/res/values-el/strings.xml | 2 + v7/appcompat/res/values-en-rAU/strings.xml | 2 + v7/appcompat/res/values-en-rGB/strings.xml | 2 + v7/appcompat/res/values-en-rIN/strings.xml | 2 + v7/appcompat/res/values-es-rUS/strings.xml | 2 + v7/appcompat/res/values-es/strings.xml | 2 + v7/appcompat/res/values-et-rEE/strings.xml | 2 + v7/appcompat/res/values-eu-rES/strings.xml | 2 + v7/appcompat/res/values-fa/strings.xml | 2 + v7/appcompat/res/values-fi/strings.xml | 2 + v7/appcompat/res/values-fr-rCA/strings.xml | 2 + v7/appcompat/res/values-fr/strings.xml | 2 + v7/appcompat/res/values-gl-rES/strings.xml | 2 + v7/appcompat/res/values-gu-rIN/strings.xml | 2 + v7/appcompat/res/values-h320dp/bools.xml | 19 + v7/appcompat/res/values-hi/strings.xml | 2 + v7/appcompat/res/values-hr/strings.xml | 2 + v7/appcompat/res/values-hu/strings.xml | 2 + v7/appcompat/res/values-hy-rAM/strings.xml | 2 + v7/appcompat/res/values-in/strings.xml | 2 + v7/appcompat/res/values-is-rIS/strings.xml | 2 + v7/appcompat/res/values-it/strings.xml | 2 + v7/appcompat/res/values-iw/strings.xml | 2 + v7/appcompat/res/values-ja/strings.xml | 2 + v7/appcompat/res/values-ka-rGE/strings.xml | 2 + v7/appcompat/res/values-kk-rKZ/strings.xml | 2 + v7/appcompat/res/values-km-rKH/strings.xml | 2 + v7/appcompat/res/values-kn-rIN/strings.xml | 2 + v7/appcompat/res/values-ko/strings.xml | 2 + v7/appcompat/res/values-ky-rKG/strings.xml | 2 + v7/appcompat/res/values-large/dimens.xml | 19 +- v7/appcompat/res/values-ldltr-v21/styles_base.xml | 28 + .../appcompat/res/values-ldrtl-v23/styles_base.xml | 9 +- v7/appcompat/res/values-lo-rLA/strings.xml | 2 + v7/appcompat/res/values-lt/strings.xml | 2 + v7/appcompat/res/values-lv/strings.xml | 2 + v7/appcompat/res/values-mk-rMK/strings.xml | 2 + v7/appcompat/res/values-ml-rIN/strings.xml | 2 + v7/appcompat/res/values-mn-rMN/strings.xml | 2 + v7/appcompat/res/values-mr-rIN/strings.xml | 2 + v7/appcompat/res/values-ms-rMY/strings.xml | 2 + v7/appcompat/res/values-my-rMM/strings.xml | 2 + v7/appcompat/res/values-nb/strings.xml | 2 + v7/appcompat/res/values-ne-rNP/strings.xml | 2 + v7/appcompat/res/values-nl/strings.xml | 2 + v7/appcompat/res/values-pa-rIN/strings.xml | 2 + v7/appcompat/res/values-pl/strings.xml | 2 + v7/appcompat/res/values-pt-rBR/strings.xml | 2 + v7/appcompat/res/values-pt-rPT/strings.xml | 2 + v7/appcompat/res/values-pt/strings.xml | 2 + v7/appcompat/res/values-ro/strings.xml | 2 + v7/appcompat/res/values-ru/strings.xml | 2 + v7/appcompat/res/values-si-rLK/strings.xml | 2 + v7/appcompat/res/values-sk/strings.xml | 2 + v7/appcompat/res/values-sl/strings.xml | 2 + v7/appcompat/res/values-sq-rAL/strings.xml | 2 + v7/appcompat/res/values-sr/strings.xml | 2 + v7/appcompat/res/values-sv/strings.xml | 2 + v7/appcompat/res/values-sw/strings.xml | 2 + v7/appcompat/res/values-ta-rIN/strings.xml | 2 + v7/appcompat/res/values-te-rIN/strings.xml | 2 + v7/appcompat/res/values-th/strings.xml | 2 + v7/appcompat/res/values-tl/strings.xml | 2 + v7/appcompat/res/values-tr/strings.xml | 2 + v7/appcompat/res/values-uk/strings.xml | 2 + v7/appcompat/res/values-ur-rPK/strings.xml | 2 + v7/appcompat/res/values-uz-rUZ/strings.xml | 2 + v7/appcompat/res/values-v17/styles_rtl.xml | 9 +- v7/appcompat/res/values-v21/styles_base.xml | 14 +- v7/appcompat/res/values-v21/themes_base.xml | 8 - v7/appcompat/res/values-v23/themes_base.xml | 6 + v7/appcompat/res/values-vi/strings.xml | 2 + v7/appcompat/res/values-xlarge/dimens.xml | 19 +- v7/appcompat/res/values-zh-rCN/strings.xml | 2 + v7/appcompat/res/values-zh-rHK/strings.xml | 2 + v7/appcompat/res/values-zh-rTW/strings.xml | 2 + v7/appcompat/res/values-zu/strings.xml | 2 + v7/appcompat/res/values/attrs.xml | 18 + v7/appcompat/res/values/bools.xml | 4 + v7/appcompat/res/values/colors_material.xml | 4 +- v7/appcompat/res/values/dimens.xml | 12 +- v7/appcompat/res/values/dimens_material.xml | 3 + v7/appcompat/res/values/strings.xml | 5 + v7/appcompat/res/values/styles.xml | 7 +- v7/appcompat/res/values/styles_base.xml | 22 +- v7/appcompat/res/values/styles_rtl.xml | 9 +- v7/appcompat/res/values/themes_base.xml | 30 +- .../support/v7/app/ActionBarDrawerToggle.java | 6 +- .../android/support/v7/app/AlertController.java | 309 +- .../android/support/v7/app/AppCompatDelegate.java | 13 +- .../support/v7/app/AppCompatDelegateImplBase.java | 17 +- .../support/v7/app/AppCompatDelegateImplV14.java | 2 +- .../support/v7/app/AppCompatDelegateImplV7.java | 115 +- .../{internal => }/app/AppCompatViewInflater.java | 165 +- .../app/NavItemSelectedListener.java | 5 +- .../android/support/v7/app/NotificationCompat.java | 2 - .../app/NotificationCompatImpl21.java | 7 +- .../app/NotificationCompatImplBase.java | 8 +- .../v7/{internal => }/app/ToolbarActionBar.java | 21 +- .../android/support/v7/app/TwilightManager.java | 22 +- .../{internal => }/app/WindowDecorActionBar.java | 46 +- .../v7/graphics/drawable/DrawerArrowDrawable.java | 7 + .../android/support/v7/internal/VersionUtils.java | 16 - .../support/v7/internal/widget/TintImageView.java | 70 - .../text/AllCapsTransformationMethod.java | 2 +- .../transition/ActionBarTransition.java | 2 +- .../v7/{internal => }/view/ActionBarPolicy.java | 2 +- .../{internal => }/view/ContextThemeWrapper.java | 2 +- .../{internal => }/view/StandaloneActionMode.java | 11 +- .../view/SupportActionModeWrapper.java | 4 +- .../{internal => }/view/SupportMenuInflater.java | 6 +- .../view/ViewPropertyAnimatorCompatSet.java | 2 +- .../{internal => }/view/WindowCallbackWrapper.java | 2 +- .../{internal => }/view/menu/ActionMenuItem.java | 4 +- .../view/menu/ActionMenuItemView.java | 2 +- .../view/menu/BaseMenuPresenter.java | 2 +- .../{internal => }/view/menu/BaseMenuWrapper.java | 2 +- .../v7/{internal => }/view/menu/BaseWrapper.java | 2 +- .../{internal => }/view/menu/ExpandedMenuView.java | 8 +- .../{internal => }/view/menu/ListMenuItemView.java | 2 +- .../view/menu/ListMenuPresenter.java | 3 +- .../v7/{internal => }/view/menu/MenuBuilder.java | 8 +- .../{internal => }/view/menu/MenuDialogHelper.java | 6 +- .../v7/{internal => }/view/menu/MenuItemImpl.java | 12 +- .../view/menu/MenuItemWrapperICS.java | 2 +- .../view/menu/MenuItemWrapperJB.java | 2 +- .../{internal => }/view/menu/MenuPopupHelper.java | 2 +- .../v7/{internal => }/view/menu/MenuPresenter.java | 2 +- .../v7/{internal => }/view/menu/MenuView.java | 2 +- .../view/menu/MenuWrapperFactory.java | 2 +- .../{internal => }/view/menu/MenuWrapperICS.java | 3 +- .../{internal => }/view/menu/SubMenuBuilder.java | 2 +- .../view/menu/SubMenuWrapperICS.java | 2 +- .../v7/{internal => }/widget/AbsActionBarView.java | 4 +- .../widget/ActionBarBackgroundDrawable.java | 18 +- .../widget/ActionBarBackgroundDrawableV21.java | 19 +- .../{internal => }/widget/ActionBarContainer.java | 5 +- .../widget/ActionBarContextView.java | 7 +- .../widget/ActionBarOverlayLayout.java | 6 +- .../support/v7/widget/ActionMenuPresenter.java | 30 +- .../android/support/v7/widget/ActionMenuView.java | 11 +- .../widget/ActivityChooserModel.java | 6 +- .../{internal => }/widget/ActivityChooserView.java | 4 +- .../v7/widget/AppCompatAutoCompleteTextView.java | 20 +- .../v7/widget/AppCompatBackgroundHelper.java | 23 +- .../android/support/v7/widget/AppCompatButton.java | 14 +- .../support/v7/widget/AppCompatCheckBox.java | 11 +- .../v7/widget/AppCompatCheckedTextView.java | 40 +- .../v7/widget/AppCompatCompoundButtonHelper.java | 10 +- .../AppCompatDrawableManager.java} | 326 +- .../support/v7/widget/AppCompatEditText.java | 14 +- .../support/v7/widget/AppCompatImageButton.java | 149 + .../support/v7/widget/AppCompatImageHelper.java | 56 + .../support/v7/widget/AppCompatImageView.java | 149 + .../widget/AppCompatMultiAutoCompleteTextView.java | 20 +- .../widget/AppCompatPopupWindow.java | 2 +- .../v7/widget/AppCompatProgressBarHelper.java | 147 + .../support/v7/widget/AppCompatRadioButton.java | 11 +- .../support/v7/widget/AppCompatRatingBar.java | 119 +- .../support/v7/widget/AppCompatSeekBar.java | 52 + .../support/v7/widget/AppCompatSeekBarHelper.java | 47 + .../support/v7/widget/AppCompatSpinner.java | 21 +- .../support/v7/widget/AppCompatTextHelper.java | 94 +- .../support/v7/widget/AppCompatTextHelperV17.java | 63 + .../support/v7/widget/AppCompatTextView.java | 100 +- .../android/support/v7/widget/ButtonBarLayout.java | 110 + .../{internal => }/widget/ContentFrameLayout.java | 29 +- .../{internal => }/widget/DecorContentParent.java | 4 +- .../v7/{internal => }/widget/DecorToolbar.java | 6 +- .../v7/{internal => }/widget/DialogTitle.java | 2 +- .../v7/{internal => }/widget/DrawableUtils.java | 7 +- .../widget/FitWindowsFrameLayout.java | 2 +- .../widget/FitWindowsLinearLayout.java | 2 +- .../{internal => }/widget/FitWindowsViewGroup.java | 2 +- .../support/v7/widget/LinearLayoutCompat.java | 2 - .../android/support/v7/widget/ListPopupWindow.java | 143 +- .../v7/{internal => }/widget/ListViewCompat.java | 31 +- .../src/android/support/v7/widget/PopupMenu.java | 10 +- .../v7/{internal => }/widget/ResourcesWrapper.java | 5 +- .../v7/{internal => }/widget/RtlSpacingHelper.java | 6 +- .../widget/ScrollingTabContainerView.java | 7 +- .../src/android/support/v7/widget/SearchView.java | 19 +- .../support/v7/widget/ShareActionProvider.java | 129 +- .../android/support/v7/widget/SwitchCompat.java | 53 +- .../v7/{internal => }/widget/ThemeUtils.java | 7 +- .../support/v7/widget/ThemedSpinnerAdapter.java | 2 +- .../{internal => }/widget/TintContextWrapper.java | 19 +- .../support/v7/{internal => }/widget/TintInfo.java | 7 +- .../v7/{internal => }/widget/TintTypedArray.java | 15 +- .../src/android/support/v7/widget/Toolbar.java | 32 +- .../widget/ToolbarWidgetWrapper.java | 83 +- .../v7/{internal => }/widget/ViewStubCompat.java | 3 +- .../v7/{internal => }/widget/ViewUtils.java | 2 +- .../support/v7/app/BaseKeyEventsTestCase.java | 52 +- .../android/support/v7/app/BaseTestActivity.java | 46 +- .../src/android/support/v7/app/DialogTestCase.java | 1 - v7/cardview/Android.mk | 15 +- v7/cardview/api/{23.txt => 23.0.0.txt} | 0 v7/cardview/api/23.1.0.txt | 26 + .../support/v7/widget/RoundRectDrawable.java | 70 +- .../v7/widget/RoundRectDrawableWithShadow.java | 15 +- .../src/android/support/v7/widget/CardView.java | 90 +- v7/gridlayout/api/{23.txt => 23.0.0.txt} | 0 v7/gridlayout/api/23.1.0.txt | 74 + .../src/android/support/v7/widget/GridLayout.java | 3 +- v7/mediarouter/Android.mk | 15 +- v7/mediarouter/api/{23.txt => 23.0.0.txt} | 0 v7/mediarouter/api/23.1.0.txt | 694 ++++ v7/mediarouter/api/current.txt | 20 +- v7/mediarouter/build.gradle | 8 +- v7/mediarouter/res/drawable-hdpi/ic_audiotrack.png | Bin 0 -> 212 bytes .../res/drawable-hdpi/ic_audiotrack_light.png | Bin 0 -> 203 bytes .../res/drawable-hdpi/ic_bluetooth_grey.png | Bin 0 -> 311 bytes .../res/drawable-hdpi/ic_bluetooth_white.png | Bin 0 -> 307 bytes v7/mediarouter/res/drawable-hdpi/ic_cast_grey.png | Bin 0 -> 400 bytes v7/mediarouter/res/drawable-hdpi/ic_cast_white.png | Bin 0 -> 394 bytes v7/mediarouter/res/drawable-hdpi/ic_close_dark.png | Bin 0 -> 221 bytes .../res/drawable-hdpi/ic_close_light.png | Bin 0 -> 207 bytes v7/mediarouter/res/drawable-hdpi/ic_pause_dark.png | Bin 165 -> 92 bytes .../res/drawable-hdpi/ic_pause_light.png | Bin 154 -> 109 bytes v7/mediarouter/res/drawable-hdpi/ic_play_dark.png | Bin 287 -> 283 bytes v7/mediarouter/res/drawable-hdpi/ic_play_light.png | Bin 270 -> 265 bytes .../res/drawable-hdpi/ic_setting_dark.png | Bin 552 -> 0 bytes .../res/drawable-hdpi/ic_setting_light.png | Bin 557 -> 0 bytes .../res/drawable-hdpi/ic_speaker_dark.png | Bin 0 -> 392 bytes .../res/drawable-hdpi/ic_speaker_group_dark.png | Bin 0 -> 403 bytes .../res/drawable-hdpi/ic_speaker_group_light.png | Bin 0 -> 408 bytes .../res/drawable-hdpi/ic_speaker_light.png | Bin 0 -> 397 bytes v7/mediarouter/res/drawable-hdpi/ic_tv_dark.png | Bin 0 -> 189 bytes v7/mediarouter/res/drawable-hdpi/ic_tv_light.png | Bin 0 -> 192 bytes v7/mediarouter/res/drawable-mdpi/ic_audiotrack.png | Bin 0 -> 150 bytes .../res/drawable-mdpi/ic_audiotrack_light.png | Bin 0 -> 145 bytes .../res/drawable-mdpi/ic_bluetooth_grey.png | Bin 0 -> 221 bytes .../res/drawable-mdpi/ic_bluetooth_white.png | Bin 0 -> 213 bytes v7/mediarouter/res/drawable-mdpi/ic_cast_grey.png | Bin 0 -> 269 bytes v7/mediarouter/res/drawable-mdpi/ic_cast_white.png | Bin 0 -> 251 bytes v7/mediarouter/res/drawable-mdpi/ic_close_dark.png | Bin 0 -> 175 bytes .../res/drawable-mdpi/ic_close_light.png | Bin 0 -> 164 bytes v7/mediarouter/res/drawable-mdpi/ic_pause_dark.png | Bin 157 -> 90 bytes .../res/drawable-mdpi/ic_pause_light.png | Bin 146 -> 101 bytes v7/mediarouter/res/drawable-mdpi/ic_play_dark.png | Bin 209 -> 220 bytes v7/mediarouter/res/drawable-mdpi/ic_play_light.png | Bin 206 -> 208 bytes .../res/drawable-mdpi/ic_setting_dark.png | Bin 362 -> 0 bytes .../res/drawable-mdpi/ic_setting_light.png | Bin 369 -> 0 bytes .../res/drawable-mdpi/ic_speaker_dark.png | Bin 0 -> 256 bytes .../res/drawable-mdpi/ic_speaker_group_dark.png | Bin 0 -> 254 bytes .../res/drawable-mdpi/ic_speaker_group_light.png | Bin 0 -> 259 bytes .../res/drawable-mdpi/ic_speaker_light.png | Bin 0 -> 259 bytes v7/mediarouter/res/drawable-mdpi/ic_tv_dark.png | Bin 0 -> 134 bytes v7/mediarouter/res/drawable-mdpi/ic_tv_light.png | Bin 0 -> 135 bytes .../res/drawable-xhdpi/ic_audiotrack.png | Bin 0 -> 235 bytes .../res/drawable-xhdpi/ic_audiotrack_light.png | Bin 0 -> 226 bytes .../res/drawable-xhdpi/ic_bluetooth_grey.png | Bin 0 -> 348 bytes .../res/drawable-xhdpi/ic_bluetooth_white.png | Bin 0 -> 344 bytes v7/mediarouter/res/drawable-xhdpi/ic_cast_grey.png | Bin 0 -> 465 bytes .../res/drawable-xhdpi/ic_cast_white.png | Bin 0 -> 460 bytes .../res/drawable-xhdpi/ic_close_dark.png | Bin 0 -> 257 bytes .../res/drawable-xhdpi/ic_close_light.png | Bin 0 -> 235 bytes .../res/drawable-xhdpi/ic_pause_dark.png | Bin 186 -> 94 bytes .../res/drawable-xhdpi/ic_pause_light.png | Bin 175 -> 111 bytes v7/mediarouter/res/drawable-xhdpi/ic_play_dark.png | Bin 338 -> 343 bytes .../res/drawable-xhdpi/ic_play_light.png | Bin 335 -> 320 bytes .../res/drawable-xhdpi/ic_setting_dark.png | Bin 764 -> 0 bytes .../res/drawable-xhdpi/ic_setting_light.png | Bin 742 -> 0 bytes .../res/drawable-xhdpi/ic_speaker_dark.png | Bin 0 -> 484 bytes .../res/drawable-xhdpi/ic_speaker_group_dark.png | Bin 0 -> 444 bytes .../res/drawable-xhdpi/ic_speaker_group_light.png | Bin 0 -> 453 bytes .../res/drawable-xhdpi/ic_speaker_light.png | Bin 0 -> 489 bytes v7/mediarouter/res/drawable-xhdpi/ic_tv_dark.png | Bin 0 -> 192 bytes v7/mediarouter/res/drawable-xhdpi/ic_tv_light.png | Bin 0 -> 199 bytes .../res/drawable-xxhdpi/ic_audiotrack.png | Bin 0 -> 323 bytes .../res/drawable-xxhdpi/ic_audiotrack_light.png | Bin 0 -> 309 bytes .../res/drawable-xxhdpi/ic_bluetooth_grey.png | Bin 0 -> 516 bytes .../res/drawable-xxhdpi/ic_bluetooth_white.png | Bin 0 -> 502 bytes .../res/drawable-xxhdpi/ic_cast_grey.png | Bin 0 -> 674 bytes .../res/drawable-xxhdpi/ic_cast_white.png | Bin 0 -> 666 bytes .../res/drawable-xxhdpi/ic_close_dark.png | Bin 0 -> 347 bytes .../res/drawable-xxhdpi/ic_close_light.png | Bin 0 -> 309 bytes .../res/drawable-xxhdpi/ic_pause_dark.png | Bin 173 -> 110 bytes .../res/drawable-xxhdpi/ic_pause_light.png | Bin 161 -> 127 bytes .../res/drawable-xxhdpi/ic_play_dark.png | Bin 480 -> 461 bytes .../res/drawable-xxhdpi/ic_play_light.png | Bin 469 -> 394 bytes .../res/drawable-xxhdpi/ic_setting_dark.png | Bin 1147 -> 0 bytes .../res/drawable-xxhdpi/ic_setting_light.png | Bin 1111 -> 0 bytes .../res/drawable-xxhdpi/ic_speaker_dark.png | Bin 0 -> 719 bytes .../res/drawable-xxhdpi/ic_speaker_group_dark.png | Bin 0 -> 693 bytes .../res/drawable-xxhdpi/ic_speaker_group_light.png | Bin 0 -> 703 bytes .../res/drawable-xxhdpi/ic_speaker_light.png | Bin 0 -> 731 bytes v7/mediarouter/res/drawable-xxhdpi/ic_tv_dark.png | Bin 0 -> 260 bytes v7/mediarouter/res/drawable-xxhdpi/ic_tv_light.png | Bin 0 -> 270 bytes .../res/drawable-xxxhdpi/ic_cast_grey.png | Bin 0 -> 903 bytes .../res/drawable-xxxhdpi/ic_cast_white.png | Bin 0 -> 883 bytes .../res/drawable-xxxhdpi/ic_close_light.png | Bin 0 -> 377 bytes .../res/drawable-xxxhdpi/ic_collapse_00000.png | Bin 0 -> 439 bytes .../res/drawable-xxxhdpi/ic_collapse_00001.png | Bin 0 -> 651 bytes .../res/drawable-xxxhdpi/ic_collapse_00002.png | Bin 0 -> 572 bytes .../res/drawable-xxxhdpi/ic_collapse_00003.png | Bin 0 -> 724 bytes .../res/drawable-xxxhdpi/ic_collapse_00004.png | Bin 0 -> 659 bytes .../res/drawable-xxxhdpi/ic_collapse_00005.png | Bin 0 -> 712 bytes .../res/drawable-xxxhdpi/ic_collapse_00006.png | Bin 0 -> 723 bytes .../res/drawable-xxxhdpi/ic_collapse_00007.png | Bin 0 -> 724 bytes .../res/drawable-xxxhdpi/ic_collapse_00008.png | Bin 0 -> 721 bytes .../res/drawable-xxxhdpi/ic_collapse_00009.png | Bin 0 -> 699 bytes .../res/drawable-xxxhdpi/ic_collapse_00010.png | Bin 0 -> 629 bytes .../res/drawable-xxxhdpi/ic_collapse_00011.png | Bin 0 -> 504 bytes .../res/drawable-xxxhdpi/ic_collapse_00012.png | Bin 0 -> 402 bytes .../res/drawable-xxxhdpi/ic_collapse_00013.png | Bin 0 -> 401 bytes .../res/drawable-xxxhdpi/ic_collapse_00014.png | Bin 0 -> 439 bytes .../res/drawable-xxxhdpi/ic_collapse_00015.png | Bin 0 -> 421 bytes .../res/drawable-xxxhdpi/ic_expand_00000.png | Bin 0 -> 421 bytes .../res/drawable-xxxhdpi/ic_expand_00001.png | Bin 0 -> 634 bytes .../res/drawable-xxxhdpi/ic_expand_00002.png | Bin 0 -> 561 bytes .../res/drawable-xxxhdpi/ic_expand_00003.png | Bin 0 -> 740 bytes .../res/drawable-xxxhdpi/ic_expand_00004.png | Bin 0 -> 657 bytes .../res/drawable-xxxhdpi/ic_expand_00005.png | Bin 0 -> 699 bytes .../res/drawable-xxxhdpi/ic_expand_00006.png | Bin 0 -> 726 bytes .../res/drawable-xxxhdpi/ic_expand_00007.png | Bin 0 -> 724 bytes .../res/drawable-xxxhdpi/ic_expand_00008.png | Bin 0 -> 733 bytes .../res/drawable-xxxhdpi/ic_expand_00009.png | Bin 0 -> 696 bytes .../res/drawable-xxxhdpi/ic_expand_00010.png | Bin 0 -> 644 bytes .../res/drawable-xxxhdpi/ic_expand_00011.png | Bin 0 -> 521 bytes .../res/drawable-xxxhdpi/ic_expand_00012.png | Bin 0 -> 449 bytes .../res/drawable-xxxhdpi/ic_expand_00013.png | Bin 0 -> 428 bytes .../res/drawable-xxxhdpi/ic_expand_00014.png | Bin 0 -> 469 bytes .../res/drawable-xxxhdpi/ic_expand_00015.png | Bin 0 -> 439 bytes .../res/drawable-xxxhdpi/ic_pause_light.png | Bin 0 -> 128 bytes .../res/drawable-xxxhdpi/ic_play_light.png | Bin 0 -> 515 bytes v7/mediarouter/res/drawable/ic_collapse.xml | 35 + v7/mediarouter/res/drawable/ic_expand.xml | 35 + .../mr_dialog_material_background_dark.xml | 19 +- .../mr_dialog_material_background_light.xml | 23 + .../res/drawable/mr_ic_audiotrack_light.xml | 19 + ...r_ic_settings_dark.xml => mr_ic_close_dark.xml} | 2 +- ...ic_settings_light.xml => mr_ic_close_light.xml} | 7 +- v7/mediarouter/res/drawable/mr_ic_pause_light.xml | 6 +- v7/mediarouter/res/drawable/mr_ic_play_light.xml | 6 +- .../res/interpolator/mr_fast_out_slow_in.xml | 22 + .../res/interpolator/mr_linear_out_slow_in.xml | 22 + .../res/layout-v17/mr_media_route_list_item.xml | 48 - ...te_chooser_dialog.xml => mr_chooser_dialog.xml} | 30 +- ...oute_list_item.xml => mr_chooser_list_item.xml} | 43 +- .../res/layout/mr_controller_material_dialog_b.xml | 96 + .../res/layout/mr_controller_volume_item.xml | 46 + ...mr_media_route_controller_material_dialog_b.xml | 141 - v7/mediarouter/res/layout/mr_playback_control.xml | 50 + v7/mediarouter/res/layout/mr_volume_control.xml | 48 + v7/mediarouter/res/values-af/strings.xml | 22 +- v7/mediarouter/res/values-am/strings.xml | 22 +- v7/mediarouter/res/values-ar/strings.xml | 22 +- v7/mediarouter/res/values-az-rAZ/strings.xml | 22 +- v7/mediarouter/res/values-bg/strings.xml | 22 +- v7/mediarouter/res/values-bn-rBD/strings.xml | 22 +- v7/mediarouter/res/values-ca/strings.xml | 22 +- v7/mediarouter/res/values-cs/strings.xml | 22 +- v7/mediarouter/res/values-da/strings.xml | 22 +- v7/mediarouter/res/values-de/strings.xml | 22 +- v7/mediarouter/res/values-el/strings.xml | 22 +- v7/mediarouter/res/values-en-rAU/strings.xml | 22 +- v7/mediarouter/res/values-en-rGB/strings.xml | 22 +- v7/mediarouter/res/values-en-rIN/strings.xml | 22 +- v7/mediarouter/res/values-es-rUS/strings.xml | 22 +- v7/mediarouter/res/values-es/strings.xml | 22 +- v7/mediarouter/res/values-et-rEE/strings.xml | 22 +- v7/mediarouter/res/values-eu-rES/strings.xml | 22 +- v7/mediarouter/res/values-fa/strings.xml | 22 +- v7/mediarouter/res/values-fi/strings.xml | 22 +- v7/mediarouter/res/values-fr-rCA/strings.xml | 22 +- v7/mediarouter/res/values-fr/strings.xml | 22 +- v7/mediarouter/res/values-gl-rES/strings.xml | 22 +- v7/mediarouter/res/values-gu-rIN/strings.xml | 22 +- v7/mediarouter/res/values-hi/strings.xml | 22 +- v7/mediarouter/res/values-hr/strings.xml | 22 +- v7/mediarouter/res/values-hu/strings.xml | 22 +- v7/mediarouter/res/values-hy-rAM/strings.xml | 22 +- v7/mediarouter/res/values-in/strings.xml | 22 +- v7/mediarouter/res/values-is-rIS/strings.xml | 22 +- v7/mediarouter/res/values-it/strings.xml | 22 +- v7/mediarouter/res/values-iw/strings.xml | 22 +- v7/mediarouter/res/values-ja/strings.xml | 22 +- v7/mediarouter/res/values-ka-rGE/strings.xml | 22 +- v7/mediarouter/res/values-kk-rKZ/strings.xml | 22 +- v7/mediarouter/res/values-km-rKH/strings.xml | 22 +- v7/mediarouter/res/values-kn-rIN/strings.xml | 22 +- v7/mediarouter/res/values-ko/strings.xml | 22 +- v7/mediarouter/res/values-ky-rKG/strings.xml | 22 +- v7/mediarouter/res/values-land/dimens.xml | 26 + v7/mediarouter/res/values-lo-rLA/strings.xml | 22 +- v7/mediarouter/res/values-lt/strings.xml | 22 +- v7/mediarouter/res/values-lv/strings.xml | 22 +- v7/mediarouter/res/values-mk-rMK/strings.xml | 22 +- v7/mediarouter/res/values-ml-rIN/strings.xml | 22 +- v7/mediarouter/res/values-mn-rMN/strings.xml | 22 +- v7/mediarouter/res/values-mr-rIN/strings.xml | 22 +- v7/mediarouter/res/values-ms-rMY/strings.xml | 22 +- v7/mediarouter/res/values-my-rMM/strings.xml | 22 +- v7/mediarouter/res/values-nb/strings.xml | 22 +- v7/mediarouter/res/values-ne-rNP/strings.xml | 22 +- v7/mediarouter/res/values-nl/strings.xml | 22 +- v7/mediarouter/res/values-pa-rIN/strings.xml | 22 +- v7/mediarouter/res/values-pl/strings.xml | 22 +- v7/mediarouter/res/values-pt-rBR/strings.xml | 22 +- v7/mediarouter/res/values-pt-rPT/strings.xml | 22 +- v7/mediarouter/res/values-pt/strings.xml | 22 +- v7/mediarouter/res/values-ro/strings.xml | 22 +- v7/mediarouter/res/values-ru/strings.xml | 22 +- v7/mediarouter/res/values-si-rLK/strings.xml | 22 +- v7/mediarouter/res/values-sk/strings.xml | 22 +- v7/mediarouter/res/values-sl/strings.xml | 22 +- v7/mediarouter/res/values-sq-rAL/strings.xml | 22 +- v7/mediarouter/res/values-sr/strings.xml | 22 +- v7/mediarouter/res/values-sv/strings.xml | 22 +- v7/mediarouter/res/values-sw/strings.xml | 22 +- v7/mediarouter/res/values-sw600dp/dimens.xml | 11 +- v7/mediarouter/res/values-sw720dp/dimens.xml | 24 + v7/mediarouter/res/values-ta-rIN/strings.xml | 22 +- v7/mediarouter/res/values-te-rIN/strings.xml | 22 +- v7/mediarouter/res/values-th/strings.xml | 22 +- v7/mediarouter/res/values-tl/strings.xml | 22 +- v7/mediarouter/res/values-tr/strings.xml | 22 +- v7/mediarouter/res/values-uk/strings.xml | 22 +- v7/mediarouter/res/values-ur-rPK/strings.xml | 22 +- v7/mediarouter/res/values-uz-rUZ/strings.xml | 22 +- v7/mediarouter/res/values-vi/strings.xml | 22 +- v7/mediarouter/res/values-zh-rCN/strings.xml | 22 +- v7/mediarouter/res/values-zh-rHK/strings.xml | 22 +- v7/mediarouter/res/values-zh-rTW/strings.xml | 22 +- v7/mediarouter/res/values-zu/strings.xml | 22 +- v7/mediarouter/res/values/attrs.xml | 18 +- v7/mediarouter/res/values/dimens.xml | 24 +- v7/mediarouter/res/values/strings.xml | 38 +- v7/mediarouter/res/values/styles.xml | 84 +- v7/mediarouter/res/values/themes.xml | 49 +- .../android/support/v7/app/MediaRouteButton.java | 29 +- .../support/v7/app/MediaRouteChooserDialog.java | 206 +- .../v7/app/MediaRouteChooserDialogFragment.java | 16 +- .../support/v7/app/MediaRouteControllerDialog.java | 844 ++++- .../v7/app/MediaRouteControllerDialogFragment.java | 13 +- .../support/v7/app/MediaRouteDialogHelper.java | 44 + .../v7/app/MediaRouteExpandCollapseButton.java | 92 + .../support/v7/app/MediaRouteVolumeSlider.java | 100 + .../support/v7/app/MediaRouterThemeHelper.java | 127 +- .../support/v7/media/MediaRouteDescriptor.java | 186 +- .../src/android/support/v7/media/MediaRouter.java | 555 ++- v7/palette/api/{23.txt => 23.0.0.txt} | 0 v7/palette/api/23.1.0.txt | 56 + v7/palette/api/current.txt | 45 +- .../android/support/v7/graphics/BucketTests.java | 68 + .../support/v7/graphics/DefaultGenerator.java | 242 -- .../java/android/support/v7/graphics/Palette.java | 493 ++- .../java/android/support/v7/graphics/Target.java | 381 +++ v7/preference/NOTICES.md | 11 + v7/preference/api/{23.txt => 23.0.0.txt} | 0 v7/preference/api/23.1.0.txt | 318 ++ v7/preference/api/current.txt | 7 +- v7/preference/build.gradle | 34 + v7/preference/proguard-rules.pro | 8 +- .../res/layout/preference_dialog_edittext.xml | 6 +- .../res/layout/preference_information.xml | 6 +- v7/preference/res/values-v17/styles.xml | 1 + v7/preference/res/values/attrs.xml | 479 +-- v7/preference/res/values/styles.xml | 29 +- v7/preference/res/values/themes.xml | 2 +- .../EditTextPreferenceDialogFragmentCompat.java | 33 +- .../android/support/v7/preference/Preference.java | 14 +- .../v7/preference/PreferenceFragmentCompat.java | 137 +- .../v7/preference/PreferenceGroupAdapter.java | 17 +- .../v7/preference/PreferenceViewHolder.java | 42 + v7/recyclerview/api/{23.txt => 23.0.0.txt} | 0 v7/recyclerview/api/23.1.0.txt | 864 +++++ v7/recyclerview/api/current.txt | 86 +- v7/recyclerview/build.gradle | 11 + .../support/v7/widget/ViewInfoStoreTest.java | 268 ++ .../android/support/v7/util/MessageThreadUtil.java | 65 +- .../android/support/v7/widget/AdapterHelper.java | 21 +- .../src/android/support/v7/widget/ChildHelper.java | 23 +- .../support/v7/widget/DefaultItemAnimator.java | 44 +- .../support/v7/widget/GridLayoutManager.java | 20 + .../support/v7/widget/LinearLayoutManager.java | 5 +- .../android/support/v7/widget/RecyclerView.java | 1596 ++++----- .../support/v7/widget/SimpleItemAnimator.java | 429 +++ .../v7/widget/StaggeredGridLayoutManager.java | 7 +- .../android/support/v7/widget/ViewInfoStore.java | 291 ++ .../support/v7/widget/helper/ItemTouchHelper.java | 5 +- .../android/support/v7/util/AsyncListUtilTest.java | 89 +- .../android/support/v7/util/BaseThreadedTest.java | 44 + .../android/support/v7/util/ThreadUtilTest.java | 25 +- .../support/v7/widget/AsyncListUtilLayoutTest.java | 9 +- .../v7/widget/BaseRecyclerViewAnimationsTest.java | 729 ++++ .../BaseRecyclerViewInstrumentationTest.java | 48 +- .../android/support/v7/widget/ChildHelperTest.java | 177 + .../support/v7/widget/DefaultItemAnimatorTest.java | 11 +- .../support/v7/widget/GridLayoutManagerTest.java | 25 +- .../android/support/v7/widget/InfoStoreTrojan.java | 39 + .../support/v7/widget/ItemAnimatorV2ApiTest.java | 541 +++ .../support/v7/widget/LoggingItemAnimator.java | 61 + .../v7/widget/RecyclerViewAnimationsTest.java | 1092 +++--- .../support/v7/widget/RecyclerViewLayoutTest.java | 35 +- .../support/v7/widget/ViewInfoStoreTest.java | 20 + .../v7/widget/helper/ItemTouchHelperTest.java | 1 - .../support/v7/widget/test/RecyclerViewTest.java | 10 + v8/renderscript/Android.mk | 2 +- v8/renderscript/api/{23.txt => 23.0.0.txt} | 0 v8/renderscript/api/23.1.0.txt | 1011 ++++++ .../support/v8/renderscript/RenderScript.java | 49 +- v8/renderscript/jni/Android.mk | 2 +- .../jni/android_renderscript_RenderScript.cpp | 60 +- 1019 files changed, 43916 insertions(+), 9461 deletions(-) 405f6d6 Avoid absolute path loading .so after M 06b40bb Import translations. DO NOT MERGE 79b1370 Import translations. DO NOT MERGE 08e1bcc Import translations. DO NOT MERGE 4448a8e MediaRouter: Make getThemeColor() work properly 7c78904 Reset SwipeRefreshLayout on window detaches. d57359e Don't mutate StateListDrawables on API 7 d9d9aec Initial proof-of-concept pass for TextViewCompat host testing. 9ad8054 Don't animate TIL error if we've been given the same error ac54e3e Copy over the wrapped drawable's bounds in wrap() 8e5ae27 GuidedStep: sync selectorView translationY to focused view ed517ae Make sure we keep Annotations in design's proguard 3645905 Fix a constructor of ForegroundLinearLayout 47543aa AppBarLayout fixes a5acc84 MediaRouter: Fix for background colors of group volume controls dbe6b40 MediaRouter: Make volume sliders move smoothly 7f43e18 Theme dark version of brand color and guided actions background ae6d147 MediaBrowser: Handle null results properly in onLoadChildren 669b23b Ensure that the indicator area is set to GONE 422fa46 GuidedStepFragment: fix temporary black screen in activity enter 517a5ef GuidedStepFragment Refactoring background handling 129a2ef Add elevation to leanback list dialogs d85f3e0 Use android namespace in (Animated)VectorDrawableCompat. e1b81bb Make sure we honor canChildScrollUp() 4705eed GuidedStepFragment: Allow app to override Ime Action text aa35ba5 [RenderScript] Load from the full path of librsjni and libRSSupport. 1888ec3 Fix wiping out a view's translationY fc3d825 Ignore iml files and out directory a666629 update leanback eclipse project settings 11cb62d GuidedStep: support checkbox and use standard android drawable c5f1ad7 Add new extensible API to Palette b656c7a Move test APKs to DIST_DIR 43e10e9 GuidedStepFragment: allow move focus to button action list 00e0529 GridLayoutManager: fire selected event when selected item type changed 242b255 MediaRouter: Dismiss the controller dialog only when a pending intent is set af0a2a4 Fix build eb51f61 MediaRouter: Loosen up the condition to show the play control layout eb17dae Remove framework dummy classes in the output of jack build ee1e0df Update docs 104ba18 Add drawable tint support to CardView 625c9c3 Allow AppCompat to work with long-press-back-menu gesture 1cf203e GuidedStepFragment: fix initial selector view size flicking 0b38116 GuidedStepFragment: morph action panel size change in fragment transaction 2b1d1d9 Fix doc build 6fa3c92 Fix crash in CTL on pre-v18 devices with no title 38cc44c Add dynamic tab support to TabLayout fe1cbed Workaround TextInputLayout state changes becoming permanent 6d7a9a0 Add compat padding to FloatingActionButton ala CardView f291fbb MediaRouter: Start the session activity when a content item is clicked 6d7f4ef Leanback: support RTL in slide transition fef15ea MediaRouter: Black magic to bring custom media metadata back c9d7594 Revert "MediaRouter: Preserve custom data in metadata between Api21 and Compat" a97810e GuidedStepFragment: multiple fixes: 19c1329 GuidedStepFragment: fix the unfocus alpha being overriden. 3d81c90 Add getter for FAB content background bc7361d Import translations. DO NOT MERGE cb3b612 NestedScrollView onStopNestedScroll fix 2490f43 MediaBrowser: Publish the API d14724d GuidedStepFragment: two columns actions 4b23181 MediaSessionCompat: Make playFromUri() work on API 21-22 86e7e29 DO NOT MERGE ANYWHERE. Update prelease version to 23.2.0-SNAPSHOT 0bd3435 Text appearance API in TextViewCompat. 380cfd7 Add setHintEnabled to TextInputLayout 3fbbd54 Fix Tab indicator animation glitch 658f2e7 MediaSession: Fix the API documentation inconsistency ecc231b Send a message with data in MediaControllerCompat.MessageHandler.post() 29dbb71 Add current.txt changes after ag/802770 4145a44 Prevent infinite loop in case of integer overflow. 9a8833a GridLayoutManager: Dont crash in measure when using weight 7b69fc3 Respect drawer's lock state in drawer toggle. b518b3a RTL support for setting drawer lock mode at activity startup. e2f7aef GuidedActionsStylist: support different viewTypes and LayoutIds 70cae05 MediaRouter: Rename mVolumeControl and mPlaybackControl for consistency 67cf3e3 Track opening / closing state of drawers for state restoration. a4b87b4 MediaBrowserCompat: Handle ServiceConnection methods in the given thread 4b2b14c MediaRouter: Fix comments. 82cf659 Support API 23 methods in MBC and MBSC fd23a2f GuidedStep: support popping multiple entries transition 7af4246 Make GuidedAction extensible, add focusable attribute bb2163a Setup GridLayoutManager state before scroll f0fddec MediaRouter: Fix unnecessary / incorrect message for audio mirroring 56264c1 MediaRouter: Preserve custom data in metadata between Api21 and Compat 3f61f16 Use Messenger instead of AIDL between MBC and MBSC 51c2e6e Handle consecutive ViewPager.setCurrentItem calls. 6f09284 GuidedStep: add standard action ids and titles 37d4ed5 Add convenient GuidedStepFragment finish methods dfed7fb MediaBrowser: Fix a wrong ISE message e4548b3 Slight tweaks to the card view. 8f9ed13 MediaRouter: Adjust correct volume slider for volume changes 8f371bf MediaRouter: Match volume slider width between main and individual items ebe391a Tweaks to drawer layout. ac6a1a3 GridLayoutManager: handle smoothscroller cancellation properly 7797b9f Workaround stateful tinting bug on <= API 23 4172f25 Fix Tabs not filling correctly in FIXED mode 5a948ff Update revision to 25 and support lib to 23.1.1 d9cbe69 Add getContentRect() API to FloatingActionButton 62aa0b2 Fix build 9d42ab8 Fix crash in FAB background tint f043da1 Revert "MediaRouter: Check a route's supporting control category" 6b565de Allow MediaBrowserCompat be connect to MediaBrowserService 9562425 GuidedStep: Support action title and description InputType 234cee3 Mark two ContextCompat methods static. 039044a Fix Palette trying to create 0px bitmaps 66698bb Flatten AppCompat class hierarchy 4452ce9 Fixes for TextInputLayout 98e3c72 Make AppCompatSpinner read android:entries da4b82f MediaRouter: Check a route's supporting control category 9703a1e Revert "Revert "Allow MediaBrowser be connect to MediaBrowserServiceCompat"" a7532cd Correct MediaMetadataCompat#METADATA_KEY_DATE Javadoc 34f5b4e Only notify of visibility changes if actually changed fc60a78 Make SwipeRefreshLayout play nice with AppBarLayout a466cf9 Don't wipe out compound drawable tinting pt.2 e948c13 Add isCounterEnabled to TextInputLayout 21690cc Propagate changes on sub menu items cd7313d Fix CollapsingToolbarLayout.setCollapsedTitleGravity() d3a70c7 Swallow exception caused by dismissing action mode a419ee1 Fix Snackbar + FloatingActionButton showing simultaneously 4935713 Revert "Allow MediaBrowser be connect to MediaBrowserServiceCompat" 89a45a9 Don't wipe out compound drawable tinting 3b2f56e Fix proguard error of NavigationView 5b64564 Fix typo 7f8e46a GuidedStepFragment: undo pressed animation when losing focus 175e98f Import translations. DO NOT MERGE 41b8b00 Import translations. DO NOT MERGE c174124 GuidedStepFragment: lots of editing improvements 47d20bd Import translations. DO NOT MERGE 23ef6d9 Fix control with dpad for NavigationView d27ec04 Fix Palette setRegion() API b8459a8 Make sure we inflate custom Tab views correctly 6a41508 Allow MediaBrowser be connect to MediaBrowserServiceCompat cdccc4c Add a way to get header views from NavigationView cb8406f Update the proguard rules again 5031b30 Fix bad hidden child recovery 38ba8d8 Import translations. DO NOT MERGE 4539dba Import translations. DO NOT MERGE 17bdec6 Fix actionMenuTextAppearance on v21-22 dcde7bf Make AppBarLayout's snap behavior honor collapsing fc780ba Respect a FloatingActionButton's visibility when anchored 204cead Allow swiped view recycling ASAP eeea73a Fix Snackbar dismisal generating two callbacks 375995f Don't let a View anchor itself to it's parent CoordinatorLayout 1560c9e Import translations. DO NOT MERGE 95ad49b Fix multi source folder API checking 097e80a Fix invisible FloatingActionButton pre-ICS 9ec922c Fix FAB using ICS APIs on Honeycomb 43bd2db Add missing PreferenceLayouts when querying item type cdf5fd0 Fix Tab width with using icon + centered tabs 487e85f Make new ResourcesCompat methods static fd7a95b Fix FloatingActionButton show() animation 17b6520 Add @attr links to TextInputLayout a96db69 Make AppCompatImageView.setImageResource(0) work bbc4b0e MediaRouter: Make MediaControllerCompat.playFromUri() work e6a1118 increase package version for another release 8403619 leanback: fix NPE of transition listener and clean up ed0e427 Update proguard config to keep base Preference class fd4eba9 Add support library deps-license script 8603357 Make sure that FAB's border respects tint updates 3f5d16c Fix typo in Palette doc 34550bb Add getters/setters for CollapsingToolbarLayout title margins 02751b1 Ensure that SwipeDismissBehavior affects the correct view 8dc93c5 Use selectable to set focusable on root pref view 5a39048 Cherrypick froom lmp-mr1-ub-dev docs: Moving usage information from ActionBar API guide a16e66f Set divider based on selectability rather than enabled 59882c8 Fix NPE when calling setUpdateListener(null) bb7b05d Add uploadArchives task to percent build.gradle 7e4e8b6 Add AppCompatDrawableManager fa9cf85 MediaRouter: Update the content description for the Cast button ac706b0 Don't clip search fragment result on the top c88e63b leanback: use item multiple align info when calculating scroll max 78e25bf Revert "Workaround Button disabled state on v21-22" 8c05e5f Doc fixes 245c7de Fix MediaSessionCompat adjustVolume crash pre-API 21 14a7007 MediaRouter: Hide the group API per request 08043c5 Fix typo in CustomTabsSession#setActionButton javadoc ce4c201 leanback: some javadoc fixes 59ad1fa Modify comments in MediaButtonReceiver 778a2b3 Remove dev moniker since libraries are about final. Public revision is 22, so moving forward to 23 for release. 3a30d0e Use the correct interpolators in the design lib ae065f9 Update RV 23.1.0 API file d807ca0 MediaRouter: New color scheme for main and group media controls 47872a2 MediaRouter: Change the default route icon from TV to Cast 53671d9 Add NOTICES.md for v7/v14 pref libs f66d912 Make sure that we clear any nested offsets ba734bb MediaRouter: Remove unnecessary padding in MRCD a2dbc75 Add uploadArchives gradle target to prefs libs 56d9fd2 MediaRouter: Fix the incorrect documentation of MRCD#onCreateMediaControlView() b1d3557 Add 23.1.0 API files c1e65b3 Ensure we use android:dropDownListViewStyle 25ef402 Allow CoordinatorLayout to handle root level pkg f5e8e4e MediaRouter: Correct the opacity values for the icons 452f94d Initial implementation of BottomSheet e09e0b4 Cleanup for item tracking 476e1cf Don't crash when scrollTo is called 4432247 Wire up change listener for leanback preference dialogs 7c89489 Disable NavigationView nested header scrolling 727fce5 MediaRouter: Fix colors fdafcdb MediaRouter: Fix the broken layout when custom control view is used 5356bc3 GuidedStepFragment: allow editing a different text than title b09d833 Update support lib version to 23.1.0-dev f23a589 Import translations. DO NOT MERGE 28f2200 Import translations. DO NOT MERGE c8771ad Import translations. DO NOT MERGE 1fcd004 Add divider support to preference support lib 092bd17 Fix TabLayout crashing due to using getMaxLines() 44eb323 Workaround Drawable mutation bugs 3eb9f74 Fix EditText background attr propogation 52a2fca Add background tinting to AppCompatTextView 62ab25d Use ParcelableCompat for CREATOR creation 6871022 MediaRouter: Use a lighter color for the group panel if needed b8d65fe Fix support library build 410d77a Disable HW Layer handling in FragmentManager pre-KK c608a7d NestedScrollView now implements ScrollingView 32a28c4 MediaRouter: Prevent volume slider from pressed by pressing parent 0b72510 MediaRouter: Use volume slider thumb provided by AppCompatSeekBar af1dca4 MediaRouter: Disable transcriptMode when it's not animating 41d6425 Prevent pointerIndex out of range IllegalArgumentException in ViewPager. d66d38a MediaRouter: Use a fixed height for individual volume sliders bd0afce Dont crash if no container for background fragment 7f3d7b0 Add PlaybackControlGlue for support v4 fragment d118156 Workaround Button disabled state on v21-22 3f175da Ship sources JAR with the design lib d5500b7 MediaRouter: Ensure volume group list item height per orientation efd0efb Increase heights of individual volume sliders e2447bb Move Compat specific MediaBrowserCompat logic to ImplBase class b56f6a6 Properly constrain leanback preference icon size 9051a36 Reuse hidden views if asked for 14c0b47 Import translations. DO NOT MERGE 0ceb9e9 Fix TwilightManager Location Permission handling d9770e1 Add support for rotating a FAB pre-L e782c87 Fix possible NPE in MenuItemImpl.toString() 3bc41c8 Fix ActionButton style parent tree e7c47b4 Fix NPE in setIcon 73aa2f6 Provide support versions of Activity.set/getMediaController 3ef0273 Fix icon margins for leanback preference items. b604eeb Add support v4 methods for Resources.getColor() and ColorStateList c38d98f MediaRouter: Implement the volume group animaion without window animation b29d995 MediaSessionCompat: fix crash when registerMediaEventReceiver needs a ComponentName. afb203b Apply transitionGroup=true for static shadow 2febd4e MediaSession: Add a null check in MediaSessionImplApi21.setCallback 2be7e6d GuidedStepFragment: slide from both side for UI_STYLE_ENTRANCE 096f253 Revert "Revert "MediaBrowser: Add the "Compat" postfix"" 5be59b3 Build the support Gradle repository in a SDK build 092898d MediaBrowser: Remove unnecessary aidl e2dc54f Revert "Revert "Backport MediaBrowser and MediaBrowserService"" 5e0e35f Fix content shifting when an Action Mode is displayed f9f8726 Revert "Make RecyclerView requestDisallowInterceptTouchEvent(true)" 7ede35a Fix AppCompatSpinner not overlaying the IME e687450 Add AppCompatImageButton + AppCompatImageView 3371878 Revert "Backport MediaBrowser and MediaBrowserService" de9762d Revert "MediaBrowser: Add the "Compat" postfix" da54b02 MediaBrowser: Add the "Compat" postfix b113d49 Backport MediaBrowser and MediaBrowserService d7b7ffc update-support-api to exclude deleted classes b749047 Workaround for NPE inFragment.mContainerId af77901 MediaRouter: Use colorAccent for default dialog button text 5dc563e SwitchCompat improvements 3224093 Accessibility improvements for design lib f7b7343 Fix AlertDialog item direction cd36803 MediaRouter: Adjust icon size properly for orientation change 6f6fdaf MediaRouter: Use default text color for button when contrast is low a63d863 GridLayoutManager: supports decorated bounds and margin ceb1d0a Make SavedState public 0ad7ef5 Add a listener to FloatingActionButton show() and hide(). 3c28b38 MediaRouter: Update package name for known audio routes 812dd06 Revert "Increase heights of individual volume sliders" 33eba8c Hide custom offset circle when transferring nested scroll events 121ba96 RecyclerView Animation API V2 c06ea51 Fix CollapsingToolbarLayout when used with SearchView 4c33be8 Fix AppBarLayout not being scrollable with fitSystemWindows=true cc82b3e AlertDialog + Dialog fixes & improvements f5e279b Increase heights of individual volume sliders 47d21fb Fix doc build of autogenerated GuidedStepSupportFragment cc0c7f3 MediaRouter: Ignore case when checking description for audio routes 4e9bfff Revert "Revert "Generate GuidedStepSupportFragment"" 42ae329 Revert "Revert "GuidedStepFragment transition and new features"" 4c5deff MediaRouter: Remove redundant getContext() from MRCD 5462d3e Fix Snackbar#show() not working after rotation 4ae9d79 Hide SearchView icon when no drawable set - support edition 8248a62 Ensure that CoL's sorted children is invalidated 26442f8 Support preference tidy d7b834d Revert "GuidedStepFragment transition and new features" 443ba2e Revert "Generate GuidedStepSupportFragment" 4fbb393 MediaRouter: Make sure the artview and group list are invalidate 8d02cf0 Generate GuidedStepSupportFragment 04b31a0 MediaRouter: Implement group volume list expand/collapse animation 6a26554 MediaRouter: Tweak the volume item height to conform to the spec 18d2225 FloatingActionButton fixes 72a0913 Improve header dragging 328f100 MediaRouter: Implement chevron/caret animation bab5423 MediaRouter: Add comments on params 0cdfe06 Properly expose methods that override a non-hidden method in a hidden superclass in the API files. dfb857d Fix ABL overlapTop behavior 56522ab Fix support_library build ba3bd19 Make sure that NestedScrollView calls stopNestedScroll 75dbda4 MediaRouter: Fix comment a405945 MediaRouter: Change font size of the list item in the chooser UI to 16sp 050b7ec MediaRouter: Publish new APIs ee7ae66 MediaRouter: Announce play/pause action for accessibility b84f420 Remove APIs for controlling EditText dialogs 7447b19 MediaRouter: Update volume sliders simultaneously c4c371f MediaRouter: Modified comments. 435661b MediaRouter: Make group volume sliders draggable f8e1601 MediaRouter: Fix media control layout visibility c5738b8 MediaRouter: Scale down group member icon size in landscape mode 1273d7f Use themed context to inflate preference views 04611d0 Fix text styling on material preference items cea5e20 Fix dependency sorting in CoordinatorLayout 8763854 Fix SwitchCompat animating while not visible 9e2e803 Fix build.gradle 37430e8 Fix call ordering issue in CollapsingTextHelper ea15dd5 MediaRouter: Apply the volume slider spec f2fe067 [Custom Tabs] Add updateVisuals() in CustomTabsService aaa885d MediaRoute: Update playback control's visibility in one place c2b193a MediaRouter: Change the accessibility strings for group expand/collpase 893feff MediaRouter: Add an API to set the receiver device type of the route c756f07 Calling setPivotY should set pivot Y ec161ac Update NavigationView to use CoordinatorLayout for header and list. 249ad6f Add support for character counter 9ae4ee8 Add error message on support lib build failure 40181af MediaRouter: Fix the controller dialog height calculation 7bb9b25 Fix flaky test 130dbe9 Fix ItemBridgeAdapter NPE af841db Remove hack with text colors 289c3d9 Stop calling onTabReselected on tab clicks 048d109 Use android: namespaced attributes in themes 8fd7b05 MediaRouter: Playback STATE_NONE should show "No media selected" 56a860b MediaRouter: Workaround for b/23703214 ce0bd5a GuidedStepFragment transition and new features 2657375 MediaRouter: Handle WRAP_CONTENT in setViewPaddingBottom() 86dcb62 MediaRouter: Defer dialog height update until the first layout 2f769dc Fix back button not working with empty menu f6c1cf8 MediaRouter: Fix regression d29e79f Improve typeface support in the collapsing text widgets 854d6b8 Fix TabLayout's flickering for good 47539ac Don't wipe out TransformationMethod if not needed b034e4a Fix action modes crashing on rotation bc22c4f Add ability to snap AppBarLayout children to edges 4832063 Take the window insets into account when ABL is dragged 19d2680 MediaRouter: Adjust padding of the volume item to comply with the spec 68b8741 Fix guided step action title multiple lines 92fa153 MediaRouter: update visibility of media control view before measuring 8367dca MediaRouter: Rename a variable for readability 3fbf2b9 MediaRouter: Address comments from the previous commit 2c8c38b MediaRouter: Hide metadata and media control if space is contrained e04300d Use selectableItemBackground for material prefs a8ba557 Protect against errant bad touch inputs 255e791 Fix BrowseFragment NPE and add Fragment tests be6358a MediaRouter: Remove white lines around artwork c74ed2d MediaRouter: Force update the art view when configuration changes f3a550c Fix Dialogs inheriting bad window flags 8d6734a MediaRouter: Set the maxHeight value manually for ListView d52e30f MediaRouter: Handle configuration change f457563 MediaRouter: Set the dialog width complying with the framework 0d35e8e Revert "Revert "MediaRouter: expand group volume section as much as it can"" 0699100 MediaRouter: Use the material dialog button bar adc8fdf MediaRouter: Keep right padding if play/pause button is missing 8bc60d9 MediaRouter: Update the art only when it hasn't been handled 8e1281a MediaRouter: Rename UI element for readbility e8085c5 Revert "MediaRouter: expand group volume section as much as it can" 9933763 MediaRouter: expand group volume section as much as it can 473c02f MediaRouter: Fix typo 0b04462 MediaRouter: Handle volume thumb color for SDK_INT < 16 bed0e72 MediaRouter: Rename the dialog width constants ea33a9b MediaRouter: Use fill_parent for consistency 40dd800 MediaRouter: Fix incorrect use of measure() 76da0b0 MediaRouter: Use the same width for the chooser dialog da471da Workaround Spinner.Underlined not working in RTL on v21-22 33be765 Fix NPE in measureHeightOfChildrenCompat 81a7956 MediaRouter: Display the empty states clearly 86a802c MediaRouter: Set volume slider color properly e214839 MediaRouter: Set dialog window width that includes padding e209a3e MediaRouter: Fix dialog width c824bd8 MediaRouter: Adjust the bottom margin of the chooser texts d2f5d27 MediaRouter: Choose a better controller style based on primary color 675566f MediaRouter: apply layout spec for group member volume control section 9932218 MediaRouter: Use app primary color for disconnect/stop button 4eb22d3 MediaRouter: Make the close button touchable acefb3d Propogate nested flings; avoid refresh while refreshing 2b274bd MediaRouter: implement group expand/collapse spec b5d323a Ensure Compat MediaStyle Large Icons are shown pre-API 21 b7b02f5 Workaround for the unexpected button alignment change 4ec1a03 MediaRouter: Fix incorrect padding usage 90ceaed MediaRouter: Cosmetic changes to the chooser dialog 5d18673 Fix NPE in OverflowPopup.dismiss() 418c688 MediaRouter: Make the scroll thumb transparent when route is unavailable 64bcb67 Revert "Revert "Use RecyclerView for NavigationView"" 1ce169b Remove MediaRouteControlHelper class 5c6a579 Use the linear layout for media control views instead of the list view 145e93b MediaRouter: Pick dominant color for portrait art work's background 5716b49 MediaRouter: Remove horizontal gap around art work c43005d Show "No media selected" message bfb90b6 MediaRouter: Update the art view visibility only when it's necessary 4bae6b7 MediaRouter: drop the control section if there is no media metadata and playback control 77367b4 MediaRouter: Show "Casting screen" if the app is being mirrored 76050a1 MediaRouter: make group expand/collapse button 48x48 7ff59b6 Refactor the layout of media route controller dialog 13d6fb5 MediaRouter: Hide artwork if vertical screen space is contrained 6e54706 MediaRouter: Apply dialog width spec a634833 MediaRoute: Polish accessibility strings 0e36aa7 MediaRouter: Handle when a group member route becomes unavailable 6d76029 Move FadeAndShortSlide to leanback 095cb67 Add null check to MediaSessionCompat.setMetadata and setPlaybackState. ca2f07c Revert "Use RecyclerView for NavigationView" 96cb4d8 Make sure that we reset the EditText backgroud tint 8f6ea77 Handle exceptions in Palette's async generation 1bb3dfe MediaRouter: Rename group API a79b35d Extract pixels from the correct Bitmap 25e53d9 Clarify Delegate onCreate call order a09c7b3 Change names from mr_media_route_xxx to mr_xxx bc171ee MediaRouter: make volume control on child routes work de8e2ba Introduce ParallelExecutorCompat into support/v4 058fb01 ShadowOverlayContainer Fix MATCH_PARENT handling 2cf13ca MediaRouter: Use the bluetooth icon for bluetooth audio devices ce43bd6 MediaRouter: Use the speaker icon for known audio devices e7b2c26 Use RecyclerView for NavigationView f0fdeab Update API file for percent library aspect ratio. 300da29 Make snapping to dimension more flexible. b48ccf4 MediaRouter: Replace the settings icon to the close icon 8213484 MediaRouter: Update the font style of route dialogs 0e5468c Fix material preference layouts and add a theme 8583308 Make ShadowOverlayHelper public and customizable 558c375 Remove theme check c738357 Exposing CompletionInfo API on SearchFragment 4800527 MediaRouter: Disable volume slider for fixed volume devices 29362a2 MediaRouter: Remove unused members and method in MediaRouteControllerDialog 6051d83 MediaRouter: Enable volume group expansion d02828a Fix animation listener being replaced by HWLayer animation listener f85bf1e Make TextInputLayout's error handling spec compliant ef45ec8 Fix OnMenuVisibilityChangeListeners not working 38e4efe MediaRouter: Find group members by unique ID when building group info f55d66d Sync the style of MediaRouteChooserDialog among different SDK versions a4bcfe7 MediaRouter: Hide the group expand button for now 10433d5 MediaRouteControlDialog: add group expand/collapse button 119de6b MediaRouter: Enable custom icons for media routes 0054826 MediaRouter: Show full height of the artwork adf6768 DO NOT MERGE Correctly measure PagerTitleStrip 3766e1d MediaRouter: Add route connection state cc91605 MediaRouter: Apply the new text style bdc5da0 Move usage scoring to RouteComparator c344398 Fix java doc for get/set AnchorId in CoordinatorLayout 06f9ee5 Add proguard rules to v7/preference 79aa418 Fix ABL + CTL not handling being initially collapsed well ecea1c3 Make the list of devices be sorted according to the usage frequency 60751b4 Details entrance transition does not slide in rows... cf3d7fb Fix AppBarLayout not being drawn after rotation a732dc2 Allow NestedScrollView to always intercept touches acbf0db Fix FloatingActionButton being invisible on Gingerbread 94d7acd Be consistent with exceptions thrown from ContentResolverCompat.query() ec07286 NavigationView now handles listener result a351536 PlaybackControl: Allow showing 0 seconds for current time 390b707 Use accent color for preference category title b8b0f57 Add @ColorInt and @DrawableRes to recommendations 8d5b8a6 Fix Gradle build + add Recommendation 18864e5 Backport ListPopupWindow fixes to AppCompat 00db92e Fix NestedScrollView intercepting touches when it shouldn't 2087fbc Fix DrawableCompat.getLayoutDirection() shim pre-M ff2ae89 MediaRouter: List route devices with representative icons 9440f0b Updates to customtabs support library 786ba35 Staggered transition support for VerticalGrid 57fd374 MediaRouter: Add comment on canDisconnectAndKeepPlaying 8d75353 Condense ALL the text in leanback-prefs c625bfe Fix animation glitch for PreferenceCategory views 6813fd3 Transition from expanded READ MORE on Play Movies new DetailsActivity e7a694b MediaRouter: Add RouteGroup 0d2f463 Make sure that AppBarLayout is laid out correctly cb37b09 TabLayout measure performance improvements 576e003 Disable invalidation tickle workaround on M+ 14113e9 Revert TabLayoutOnPageChangeListener change bb664e9 MediaRouter: MediaRouteChooserDialog layout 7644941 MediaRouter: Apply new UX for loading delay of the chooser dialog e9f1ca9 Improvements around CollapsingToolbarLayout's scrims ea004a0 AppBarLayout layout/measure fixes 98ae244 Backport M's android:onClick functionality to AppCompat c3a5ae2 Update TabLayout to Material Spec ab2ef13 Revert "MediaRouterV2: MediaRouteChooserDialog layout" 8e3673d MediaRouterV2: MediaRouteChooserDialog layout da2c0c3 Add elevation to LB prefs decor 403b20a Add getPaint() to DrawerArrowDrawable ce4bafd Add region API to Palette e317b75 Modify the interface of TransportMediatorJellybeanMR2 to fix build issues 3965a30 Set windowNoTitle false of MediaRouter themes 14b631f Put system live audio only routes at bottom of MediaRouteChooserDialog bd08221 Make Media Compat API level specific helpers non-public 3553f4a Update AppCompat dark ripple color to match framework 3531cb3 Make FloatingActionButton focusable ac07e9d Allow action item layouts that do not supply editable actions. 1339fcd Add MediaSessionCompat aware Media Button Receiver 6ea5bcf Find Media Button Receiver in manifest for MediaSessionCompat 5a7cd82 MediaRouter: make MediaRouteButton comform to Widget.AppCompat.ActionButton 45fa60f Add default on/off strings to SwitchCompat 964d191 Fix SwitchCompat being able to be dragged in inbetween state 23caabc Support text shadows in CollapsingTextHelper 809bb62 Add more helpful exception to design components 69d050a Dont change android:background in ContextThemeWrapper 4158705 Add support for editable actions to GuidedSteps ba2a96a Fix tab indicator getting out of sync 92d279c Fix FAB visibility=gone not working pre-v21 4369f8b Actually use the hint provided from attrs 4d14fb5 Further change for ShadowOverlayHelper 91a95c4 Throw exception if setContentView() is called improperly 10e2dbc Backport material SeekBar 20921be Force use ShadowOverlayContainer for overlay 254b417 Remove overlay view for better performance 459e0ea Fixed focus bug in new ImageCardView 15cb52e Fix doc typo for default wearable notification size. 9b8f708 Backport AlertDialog's button stacking 36d347c NavigationView now supports app:actionLayout ce3ffc6 ImageCardView Badge visibility and viewType issues fixed. 02aa201 Make ColorUtils.calculateMinimumAlpha more accurate d8750f8 Add leanback preference layouts 8b0a90d Fix margins for leanback preference header b1aad00 Allow for equal width/height dimensions for percent layout children. 1ddfd71 add overrides for generateDefaultLayoutParams(). ========platform/frameworks/volley between android-6.0.1_r46..android-6.0.1_r54========= .../com/android/volley/toolbox/ImageRequest.java | 22 +++++++++++----------- .../android/volley/toolbox/ImageRequestTest.java | 4 ++++ 2 files changed, 15 insertions(+), 11 deletions(-) 82462cd Make default timeout/retry/multiplier values public ========platform/frameworks/webview between android-6.0.1_r46..android-6.0.1_r54========= chromium/listing/res/values-az-rAZ/strings.xml | 13 ------------- chromium/listing/res/values-bn-rBD/strings.xml | 4 ++-- chromium/listing/res/values-en-rAU/strings.xml | 2 +- chromium/listing/res/values-en-rGB/strings.xml | 2 +- chromium/listing/res/values-en-rIN/strings.xml | 2 +- chromium/listing/res/values-gu-rIN/strings.xml | 2 +- chromium/listing/res/values-kn-rIN/strings.xml | 2 +- chromium/listing/res/values-nl/strings.xml | 2 +- chromium/listing/res/values-pt-rBR/strings.xml | 13 ------------- chromium/listing/res/values-sq-rAL/strings.xml | 4 ++-- 10 files changed, 10 insertions(+), 36 deletions(-) 7102c36 Import translations. DO NOT MERGE bb3e2d9 Import translations. DO NOT MERGE 1db8b6b Revert "Implement stub functions" 63deb68 Implement stub functions aba5740 Add version code support for mips64. 2013533 Import translations. DO NOT MERGE cb0c757 Fix remaining references to hidden fields. 0485a46 Track move of android.net.http.ErrorStrings. 12399ba Fix WebView targetSDK checks. c6c1f3d Add support for SmartClip interface in the glue layer. 0dd72dc [WebView] Start building against the System SDK. 4570250 [WebView] Remove direct dependencies on hidden APIs. edcfb0f [WebView] Remove unused method in CookieManager 446ce2c Add support for SmartClip interface in the glue layer. 4eb3b4b [WebView] Remove dependencies on DebugFlags. bf95f76 [WebView] Remove dependency on Build.IS_DEBUGGABLE. 9ee9488 Import translations. DO NOT MERGE 4bb8eed Revert "Wrap one more Context" 5112943 [WebView] Remove dependency on FileUtils. 8a2779d Always add the path to the WebView assets. ddbcc03 Always add the path to the WebView assets. 011b28c Remove DRP manager code 9f3473a Fix reflection for detecting fullscreen API support. 6fb047a Match removal of config_webSettingsDefaultTextEncoding. e494d2a Match removal of config_webSettingsDefaultTextEncoding. 2de594d Remove the default text encoding resource. 53dc1aa Match removal of config_webSettingsDefaultTextEncoding. d6a17bc Use overridden resources. f696600 Webview: Remove dexpreopt flag b20977d Remove WebView DRP Setting from Developer Settings f0c97c1 Wrap one more Context e41c9c1 Suport initializing DRP from cmd line switches. a1b0248 Wrap all of the WebView Contexts 85e03c0 WebView does not require a touch screen. 8473b38 Update WebView manifest to target/minSDK 21. fd23af2 Fix resource rewriting in apps with other shared libs. b1100a8 Use drawables instead of mipmap for WebView icon. df873b4 Import translations. DO NOT MERGE a8cbb40 Disable dex-preopt. a17d86e Don't use reflection to rewrite the WebView resources. 03af49a WebViewChromiumFactoryProvider should import ResourceExtractor fromorg.chromium.base 91c538c Remove check for styleable resources in WebView ResourceRewriter. 3571668 Implement FileChooserParams.createIntent and parseResult b709ef5 Match rename of WebResourceRequest.hasUserGestureInsecure to hasGesture. 98f9a27 Prepare for rename of WebResourceRequest.hasUserGestureInsecure to hasGesture. 44d477c Remove the plumbing for optOutDataReductionProxy API e73e669 Update some content classes to content_public 5b026de Remove the plumbing for optOutDataReductionProxy API db0b20b Import translations. DO NOT MERGE 29ddcde Don't declare WebView as a library. f3f92fd Don't declare WebView as a library. b1cbea9 Suppress StrictMode warning reading command line file. 1288f69 Update API name to comply with changes to API 874c81b Update WebView APK name. 1987003 Cherry-pick: Remove debug logging. cfadfad Don't use android.internal.R for resources. fd40957 AOSP-only changes to support the WebView loading from an APK. 0a00dfc Generate symlinks to libwebviewchromium.so in /system/priv-app b825b81 Generate resources before running aapt. 8239879 Include pak files in the WebView apk. c182da2 Disable building the APK when a prebuilt is in use. d54876d Move WebView resources to separate APK 62cac14 Add com.android.webview to the package whitelist. ab83716 Make the WebView Java library into an APK. 94bf55c WebView fix for devices running 562183 bytes bcmdhd/firmware/bcm4339/fw_bcmdhd_apsta.bin | Bin 500032 -> 500031 bytes bcmdhd/firmware/bcm4343/device-bcm.mk | 17 +++++++++++++++-- bcmdhd/firmware/bcm4343/fw_bcm4343.bin | Bin 342252 -> 342292 bytes bcmdhd/firmware/bcm4343/fw_bcm4343_a1.bin | Bin 0 -> 325341 bytes bcmdhd/firmware/bcm4343/fw_bcm4343_a1_apsta.bin | Bin 0 -> 297097 bytes bcmdhd/firmware/bcm4343/fw_bcm4343_apsta.bin | Bin 313848 -> 313852 bytes bcmdhd/firmware/bcm4354/fw_bcm4354.bin | Bin 625474 -> 625336 bytes bcmdhd/firmware/bcm4354/fw_bcm4354_ap.bin | Bin 548145 -> 548019 bytes bcmdhd/firmware/bcm4356/fw_bcm4356_ap_pcie.bin | Bin 588159 -> 588177 bytes bcmdhd/firmware/bcm4356/fw_bcm4356_pcie.bin | Bin 660969 -> 660986 bytes bcmdhd/firmware/bcm4358/fw_bcm4358.bin | Bin 629128 -> 624655 bytes bcmdhd/firmware/bcm4358/fw_bcm4358_ap.bin | Bin 559288 -> 559737 bytes bcmdhd/wifi_hal/cpp_bindings.cpp | 3 +++ 14 files changed, 18 insertions(+), 2 deletions(-) 345e745 net: wireless: bcmdhd: Update bcm4358 FW (7.112.100.48) [DO NOT MERGE] b8c05d4 net: wireless: bcmdhd: update bcm4358 FW (7.112.100.47) [DO NOT MERGE] 0095a04 Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.200.5) [DO NOT MERGE]" 6046a46 net: wireless: bcmdhd: update bcm4358 FW (7.112.200.5) [DO NOT MERGE] 3a30c03 Fix a potential leak of nl_msg objects 2ce1c49 Fix use-after-free in wifi_cleanup() 0bdf1ae Revert "Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.44)"" 6c751ac Revert "Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.41)"" be0867b Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.44)" c907db1 Revert "net: wireless: bcmdhd: update bcm4358 FW (7.112.100.41)" 2bdea8b bcm4343: Update firmware BCM4343A0/BCM4343A1 0f377dc bcm4343: Update firmware BCM4343A1 chip to 7.13.53.2 9e5fed2 bcm4343: Add firmware BC4343A1 chip to 7.13.53.1 ========platform/hardware/intel/common/omx-components between android-6.0.1_r46..android-6.0.1_r54========= e140b31 fix random SEGV issue which is caused by wild pointer in libmix ========platform/hardware/intel/img/hwcomposer between android-6.0.1_r46..android-6.0.1_r54========= merrifield/common/base/DisplayAnalyzer.cpp | 9 - merrifield/common/base/VsyncManager.cpp | 2 - merrifield/common/devices/PhysicalDevice.cpp | 24 +- merrifield/common/devices/VirtualDevice.cpp | 89 ++++-- merrifield/common/utils/HwcTrace.h | 10 +- merrifield/include/IDisplayDevice.h | 2 - merrifield/include/VirtualDevice.h | 23 +- merrifield/include/pvr/hal/hal_public.h | 249 ++--------------- merrifield/include/pvr/hal/img_gralloc_public.h | 302 +++++++++++++++++++++ merrifield/ips/common/DrmConfig.cpp | 4 +- merrifield/ips/common/WsbmWrapper.c | 5 +- merrifield/ips/tangier/TngDisplayContext.cpp | 6 +- merrifield/ips/tangier/TngDisplayContext.h | 14 + merrifield/ips/tangier/TngGrallocBufferMapper.cpp | 35 ++- merrifield/ips/tangier/TngGrallocBufferMapper.h | 2 +- merrifield/platforms/merrifield/Android.mk | 12 +- merrifield/platforms/merrifield/PlatFactory.cpp | 4 - .../platforms/merrifield/PlatfBufferManager.cpp | 11 +- merrifield/platforms/merrifield_plus/Android.mk | 13 +- .../platforms/merrifield_plus/PlatFactory.cpp | 2 - .../merrifield_plus/PlatfBufferManager.cpp | 11 +- 21 files changed, 505 insertions(+), 324 deletions(-) f65be04 Use default csc mode and video range setting for HDMI. Update VideoPayloadBuffer to align with palyload in video driver 37c6cdc IMG HWC: DDK1.5 upgrade for Merrifield f2c6d3a hwc: Enabling ION - HWC ec73412 DrmConfig: Change DRM_MODE_ENCODER_MIPI to DRM_MODE_ENCODER_DSI a47d9a7 Fix M Upgrade Compilation issues 219b696 Display: power consumption saving 040739a Hwcomposer: Enable VirtualDisplay feature 79c344a Set proper blanking mode for DOZE 59b4d76 Set proper blanking mode for DOZE ========platform/hardware/intel/sensors between android-6.0.1_r46..android-6.0.1_r54========= 68dc9e7 remove robby sensor code 2f7df31 add an option to use prebuilts ddb7674 Fix libsensors_iio build after stlport removed 968fe44 sensors: als & tilt: fix E build errors 50adf5f [Grant] libsensor_iio: fix build errors 6ff827f sensor: poll for POLLOUT event before writing pipe b219170 sensor: generate flush_complete event when data timestamps matches 4d9b8f6 sensor: increase pipe size to avoid pipe overrun db6e001 sensor: fix step counter data type casting 7193963 sensor: add iio buffer store length support 1748bd6 Revert "sensor: sensor events timestamp out of expected range" c430675 sensor: sensor events timestamp out of expected range 7a7aa43 sensor: scaling gyro data for better accuracy f4cc133 sensor: change als timestamp to CLOCK_BOOTTIME d230af7 sensor: fix lsm6ds3 HAL bug for more accurate sampling rate beeb640 sensor: correct gyro direction of y axis 864d352 sensor: fix flush interface implement f86fa3a sensor: remove debug logs from HAL code of tilt and ALS 7973c2f sensor: fix lsm6ds3 HAL bug which abondons sensor events by mistake 3b77ab1 sensor: remove unnecessary set_delay and batch function implementation aedbd2b sensor: add Gravity and Linear Accelerometer virtual sensors support 7a627f4 Sensor: change activate tilt sequences 7e89936 Sensor: adjust lsm6ds3 axis since PCB is assembled bottom-up. 76227f0 Sensor: load calibration data for wakeup/non-wakeup sensor 90158e8 Sensor: Correct flush function for different types of sensors 5957f5f Sensor: Set robby as common device f75e2d2 Sensor: load calibration data at boot 94781c7 Sensor: Change sensor type definition for tilt on Diamond be1c9f4 Sensor: Implement ALS flush function fb2fb5a Sensor: Implement tilt sensor flush function 1f9b03c Add ambient light sensor HAL 91428d8 Modify ST-HAL-IIO to adapt marvin product 049ab1d Original code get from ST for lsm6ds3 sensor base on iio subsystem 0d5f998 add lis3dsh tilt sensor HAL code c5ad85b Sensor: Allow inclusion only for Robby sensors ========platform/hardware/invensense between android-6.0.1_r46..android-6.0.1_r54========= 6515/libsensors_iio/Android.mk | 13 + 6515/libsensors_iio/InputEventReader.cpp | 1 + 6515/libsensors_iio/MPLSensor.cpp | 450 +++++++++++++++++++++---------- 6515/libsensors_iio/MPLSensor.h | 6 +- 6515/libsensors_iio/MPLSupport.cpp | 30 +-- 6515/libsensors_iio/SensorBase.cpp | 7 +- 6515/libsensors_iio/sensors_mpl.cpp | 35 ++- 7 files changed, 376 insertions(+), 166 deletions(-) f332a4e Sensor: Invensense: 6515: fix step counter corrupting event queue 12e29ea Sensor: Invensense: 6515: return one flush complete per flush 7af2cd1 Sensors: Invensense: 6515: don't send duplicate events 63e566c Sensors: Invensense: 6515: ignore SMD event if vibrator active 822ea53 Sensors: Invensense: 6515: Merge timestamp fixes 980569f Fix compilation error on emerald-dev 70d66cf Invensense: 6515: use CLOCK_BOOTTIME for timestamps ========platform/hardware/libhardware between android-6.0.1_r46..android-6.0.1_r54========= include/hardware/bluetooth.h | 13 +------------ modules/sensors/multihal.cpp | 2 ++ 2 files changed, 3 insertions(+), 12 deletions(-) 76ee32a Add guest mode functionality (1/3) 4fd217a Fix compilation error on emerald-dev ========platform/hardware/qcom/audio between android-6.0.1_r46..android-6.0.1_r54========= Android.mk | 6 + hal/Android.mk | 4 + hal/audio_extn/hfp.c | 16 + hal/audio_hw.c | 2 +- hal/audio_hw.h | 1 + hal/msm8974/platform.c | 36 +- hal/msm8974/platform.h | 22 +- hal/voice.c | 3 +- msm8909/Android.mk | 25 + msm8909/audiod/Android.mk | 19 + msm8909/audiod/AudioDaemon.cpp | 460 ++ msm8909/audiod/AudioDaemon.h | 92 + msm8909/audiod/audiod_main.cpp | 60 + msm8909/hal/Android.mk | 251 + msm8909/hal/audio_extn/a2dp.c | 201 + msm8909/hal/audio_extn/audio_defs.h | 105 + msm8909/hal/audio_extn/audio_extn.c | 810 ++++ msm8909/hal/audio_extn/audio_extn.h | 422 ++ msm8909/hal/audio_extn/compress_capture.c | 155 + msm8909/hal/audio_extn/dev_arbi.c | 169 + msm8909/hal/audio_extn/dolby.c | 685 +++ msm8909/hal/audio_extn/fm.c | 302 ++ msm8909/hal/audio_extn/hfp.c | 363 ++ msm8909/hal/audio_extn/listen.c | 260 + msm8909/hal/audio_extn/pm.c | 149 + msm8909/hal/audio_extn/pm.h | 68 + msm8909/hal/audio_extn/soundtrigger.c | 358 ++ msm8909/hal/audio_extn/spkr_protection.c | 916 ++++ msm8909/hal/audio_extn/ssr.c | 503 ++ msm8909/hal/audio_extn/usb.c | 730 +++ msm8909/hal/audio_extn/utils.c | 592 +++ msm8909/hal/audio_hw.c | 3539 ++++++++++++++ msm8909/hal/audio_hw.h | 334 ++ msm8909/hal/msm8916/hw_info.c | 293 ++ msm8909/hal/msm8916/platform.c | 2964 ++++++++++++ msm8909/hal/msm8916/platform.h | 267 ++ msm8909/hal/msm8960/platform.c | 1088 +++++ msm8909/hal/msm8960/platform.h | 150 + msm8909/hal/msm8974/hw_info.c | 397 ++ msm8909/hal/msm8974/platform.c | 2919 +++++++++++ msm8909/hal/msm8974/platform.h | 347 ++ msm8909/hal/platform_api.h | 99 + msm8909/hal/platform_info.c | 311 ++ msm8909/hal/voice.c | 509 ++ msm8909/hal/voice.h | 96 + msm8909/hal/voice_extn/compress_voip.c | 811 ++++ msm8909/hal/voice_extn/voice_extn.c | 611 +++ msm8909/hal/voice_extn/voice_extn.h | 275 ++ msm8909/mm-audio/Android.mk | 3 + msm8909/mm-audio/Makefile | 10 + msm8909/mm-audio/Makefile.am | 5 + msm8909/mm-audio/aenc-aac/Android.mk | 8 + msm8909/mm-audio/aenc-aac/Makefile | 6 + msm8909/mm-audio/aenc-aac/Makefile.am | 1 + msm8909/mm-audio/aenc-aac/qdsp6/Android.mk | 68 + msm8909/mm-audio/aenc-aac/qdsp6/Makefile | 81 + msm8909/mm-audio/aenc-aac/qdsp6/Makefile.am | 30 + msm8909/mm-audio/aenc-aac/qdsp6/inc/Map.h | 244 + msm8909/mm-audio/aenc-aac/qdsp6/inc/aenc_svr.h | 120 + msm8909/mm-audio/aenc-aac/qdsp6/inc/omx_aac_aenc.h | 629 +++ msm8909/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c | 206 + .../mm-audio/aenc-aac/qdsp6/src/omx_aac_aenc.cpp | 5062 ++++++++++++++++++++ .../aenc-aac/qdsp6/test/omx_aac_enc_test.c | 1293 +++++ msm8909/mm-audio/aenc-amrnb/Android.mk | 8 + msm8909/mm-audio/aenc-amrnb/Makefile | 6 + msm8909/mm-audio/aenc-amrnb/qdsp6/Android.mk | 68 + msm8909/mm-audio/aenc-amrnb/qdsp6/Makefile | 81 + msm8909/mm-audio/aenc-amrnb/qdsp6/inc/Map.h | 244 + msm8909/mm-audio/aenc-amrnb/qdsp6/inc/aenc_svr.h | 120 + .../mm-audio/aenc-amrnb/qdsp6/inc/omx_amr_aenc.h | 538 +++ msm8909/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c | 205 + .../mm-audio/aenc-amrnb/qdsp6/src/omx_amr_aenc.cpp | 4532 ++++++++++++++++++ .../aenc-amrnb/qdsp6/test/omx_amr_enc_test.c | 1055 ++++ msm8909/mm-audio/aenc-evrc/Android.mk | 7 + msm8909/mm-audio/aenc-evrc/Makefile | 6 + msm8909/mm-audio/aenc-evrc/qdsp6/Android.mk | 67 + msm8909/mm-audio/aenc-evrc/qdsp6/Makefile | 81 + msm8909/mm-audio/aenc-evrc/qdsp6/inc/Map.h | 244 + msm8909/mm-audio/aenc-evrc/qdsp6/inc/aenc_svr.h | 122 + .../mm-audio/aenc-evrc/qdsp6/inc/omx_evrc_aenc.h | 539 +++ msm8909/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c | 205 + .../mm-audio/aenc-evrc/qdsp6/src/omx_evrc_aenc.cpp | 4531 ++++++++++++++++++ .../aenc-evrc/qdsp6/test/omx_evrc_enc_test.c | 1098 +++++ msm8909/mm-audio/aenc-qcelp13/Android.mk | 7 + msm8909/mm-audio/aenc-qcelp13/Makefile | 6 + msm8909/mm-audio/aenc-qcelp13/qdsp6/Android.mk | 69 + msm8909/mm-audio/aenc-qcelp13/qdsp6/Makefile | 81 + msm8909/mm-audio/aenc-qcelp13/qdsp6/inc/Map.h | 244 + msm8909/mm-audio/aenc-qcelp13/qdsp6/inc/aenc_svr.h | 120 + .../aenc-qcelp13/qdsp6/inc/omx_qcelp13_aenc.h | 539 +++ msm8909/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c | 208 + .../aenc-qcelp13/qdsp6/src/omx_qcelp13_aenc.cpp | 4532 ++++++++++++++++++ .../aenc-qcelp13/qdsp6/test/omx_qcelp13_enc_test.c | 1101 +++++ msm8909/mm-audio/autogen.sh | 10 + msm8909/mm-audio/configure.ac | 44 + msm8909/policy_hal/Android.mk | 69 + msm8909/policy_hal/AudioPolicyManager.cpp | 1951 ++++++++ msm8909/policy_hal/AudioPolicyManager.h | 164 + msm8909/post_proc/Android.mk | 34 + msm8909/post_proc/bass_boost.c | 280 ++ msm8909/post_proc/bass_boost.h | 59 + msm8909/post_proc/bundle.c | 780 +++ msm8909/post_proc/bundle.h | 92 + msm8909/post_proc/effect_api.c | 620 +++ msm8909/post_proc/effect_api.h | 151 + msm8909/post_proc/equalizer.c | 497 ++ msm8909/post_proc/equalizer.h | 63 + msm8909/post_proc/reverb.c | 613 +++ msm8909/post_proc/reverb.h | 84 + msm8909/post_proc/virtualizer.c | 503 ++ msm8909/post_proc/virtualizer.h | 60 + msm8909/visualizer/Android.mk | 36 + msm8909/visualizer/MODULE_LICENSE_APACHE2 | 0 msm8909/visualizer/NOTICE | 190 + msm8909/visualizer/offload_visualizer.c | 1267 +++++ msm8909/voice_processing/Android.mk | 23 + msm8909/voice_processing/voice_processing.c | 765 +++ post_proc/bundle.c | 5 +- voice_processing/voice_processing.c | 4 +- 119 files changed, 59579 insertions(+), 10 deletions(-) ac4fe9e DO NOT MERGE Fix AudioEffect reply overflow 582e0a5 audio: msm8909w caf release LW.BR.1.0-00410-8x09w.0 ebbb823 post proc : volume listener : fix effect release crash b14d76b hal: audio_stream_frame_size is deprecated a1f4805 hal: Support mute/unmute for HFP Tx e9ef478 hal: Use default acdb id for hfp 7629719 hal: Add support for HFP feature 28ddc6f hal: Support an external BT chip for HFP fe121d5 hal: add default SND device c92c596 Revert "Revert "hal: add support for multi-mic input and multi-channel output"" 93be0a5 Revert "hal: add support for multi-mic input and multi-channel output" 075842f Hal: Support an external BT chip for HFP 45849f6 Add voice call support for msm8x26 target 11dd223 hal: fix to load wcd9330 mixer path file ========platform/hardware/qcom/camera between android-6.0.1_r46..android-6.0.1_r54========= QCamera2/HAL3/QCamera3HWI.cpp | 17 +++++++++++++++++ QCamera2/stack/common/cam_intf.h | 1 + QCamera2/stack/common/cam_types.h | 2 ++ QCamera2/stack/mm-camera-interface/src/mm_camera.c | 8 +++++++- 4 files changed, 27 insertions(+), 1 deletion(-) 8b3ca9d mm_camera: Retry opening camera for ENODEV error eeeffc0 QCamera2: HAL3: replace abort with exit ecc5ece QCamera2: HAL3: Restart daemon and mediaserver when buffer is lost. ========platform/hardware/qcom/display between android-6.0.1_r46..android-6.0.1_r54========= Android.mk | 4 + msm8226/common.mk | 5 + msm8226/libgralloc/gpu.cpp | 4 + msm8226/libhwcomposer/Android.mk | 10 + msm8226/libhwcomposer/hwc.cpp | 59 +- msm8226/libhwcomposer/hwc_delta_panel.cpp | 120 ++ msm8226/libhwcomposer/hwc_delta_panel.h | 26 + msm8226/libhwcomposer/hwc_mdpcomp.cpp | 8 + msm8226/liboverlay/overlayRotator.h | 4 + msm8909/Android.mk | 10 + msm8909/common.mk | 61 + msm8909/libcopybit/Android.mk | 48 + msm8909/libcopybit/MODULE_LICENSE_APACHE2 | 0 msm8909/libcopybit/NOTICE | 189 ++ msm8909/libcopybit/c2d2.h | 683 +++++++ msm8909/libcopybit/copybit.cpp | 787 ++++++++ msm8909/libcopybit/copybit.h | 304 +++ msm8909/libcopybit/copybit_c2d.cpp | 1773 ++++++++++++++++ msm8909/libcopybit/copybit_priv.h | 56 + msm8909/libcopybit/software_converter.cpp | 263 +++ msm8909/libcopybit/software_converter.h | 62 + msm8909/libgralloc/Android.mk | 46 + msm8909/libgralloc/MODULE_LICENSE_APACHE2 | 0 msm8909/libgralloc/NOTICE | 190 ++ msm8909/libgralloc/alloc_controller.cpp | 676 +++++++ msm8909/libgralloc/alloc_controller.h | 72 + msm8909/libgralloc/fb_priv.h | 56 + msm8909/libgralloc/framebuffer.cpp | 461 +++++ msm8909/libgralloc/gpu.cpp | 415 ++++ msm8909/libgralloc/gpu.h | 74 + msm8909/libgralloc/gr.h | 159 ++ msm8909/libgralloc/gralloc.cpp | 116 ++ msm8909/libgralloc/gralloc_priv.h | 297 +++ msm8909/libgralloc/ionalloc.cpp | 239 +++ msm8909/libgralloc/ionalloc.h | 74 + msm8909/libgralloc/mapper.cpp | 441 ++++ msm8909/libgralloc/memalloc.h | 89 + msm8909/libhdmi/Android.mk | 13 + msm8909/libhdmi/hdmi.cpp | 699 +++++++ msm8909/libhdmi/hdmi.h | 110 + msm8909/libhwcomposer/Android.mk | 66 + msm8909/libhwcomposer/hwc.cpp | 978 +++++++++ msm8909/libhwcomposer/hwc_ad.cpp | 278 +++ msm8909/libhwcomposer/hwc_ad.h | 66 + msm8909/libhwcomposer/hwc_copybit.cpp | 1374 +++++++++++++ msm8909/libhwcomposer/hwc_copybit.h | 149 ++ msm8909/libhwcomposer/hwc_dump_layers.cpp | 452 +++++ msm8909/libhwcomposer/hwc_dump_layers.h | 138 ++ msm8909/libhwcomposer/hwc_fbupdate.cpp | 565 ++++++ msm8909/libhwcomposer/hwc_fbupdate.h | 111 + msm8909/libhwcomposer/hwc_mdpcomp.cpp | 2830 ++++++++++++++++++++++++++ msm8909/libhwcomposer/hwc_mdpcomp.h | 371 ++++ msm8909/libhwcomposer/hwc_qclient.cpp | 401 ++++ msm8909/libhwcomposer/hwc_qclient.h | 67 + msm8909/libhwcomposer/hwc_qdcm.cpp | 292 +++ msm8909/libhwcomposer/hwc_qdcm.h | 94 + msm8909/libhwcomposer/hwc_qdcm_legacy.cpp | 79 + msm8909/libhwcomposer/hwc_uevents.cpp | 243 +++ msm8909/libhwcomposer/hwc_utils.cpp | 2902 +++++++++++++++++++++++++++ msm8909/libhwcomposer/hwc_utils.h | 718 +++++++ msm8909/libhwcomposer/hwc_virtual.cpp | 236 +++ msm8909/libhwcomposer/hwc_virtual.h | 64 + msm8909/libhwcomposer/hwc_vsync.cpp | 236 +++ msm8909/liblight/Android.mk | 27 + msm8909/liblight/NOTICE | 190 ++ msm8909/liblight/lights.c | 353 ++++ msm8909/libmemtrack/Android.mk | 27 + msm8909/libmemtrack/kgsl.c | 132 ++ msm8909/libmemtrack/memtrack_msm.c | 63 + msm8909/libmemtrack/memtrack_msm.h | 24 + msm8909/liboverlay/Android.mk | 22 + msm8909/liboverlay/mdpWrapper.h | 388 ++++ msm8909/liboverlay/overlay.cpp | 582 ++++++ msm8909/liboverlay/overlay.h | 428 ++++ msm8909/liboverlay/overlayCtrlData.h | 249 +++ msm8909/liboverlay/overlayMdp.cpp | 397 ++++ msm8909/liboverlay/overlayMdp.h | 317 +++ msm8909/liboverlay/overlayMdpRot.cpp | 322 +++ msm8909/liboverlay/overlayMdssRot.cpp | 430 ++++ msm8909/liboverlay/overlayMem.h | 222 ++ msm8909/liboverlay/overlayRotator.cpp | 242 +++ msm8909/liboverlay/overlayRotator.h | 322 +++ msm8909/liboverlay/overlayUtils.cpp | 399 ++++ msm8909/liboverlay/overlayUtils.h | 683 +++++++ msm8909/liboverlay/overlayWriteback.cpp | 280 +++ msm8909/liboverlay/overlayWriteback.h | 122 ++ msm8909/liboverlay/pipes/overlayGenPipe.cpp | 124 ++ msm8909/liboverlay/pipes/overlayGenPipe.h | 86 + msm8909/libqdutils/Android.mk | 33 + msm8909/libqdutils/cb_swap_rect.cpp | 46 + msm8909/libqdutils/cb_swap_rect.h | 51 + msm8909/libqdutils/cb_utils.cpp | 133 ++ msm8909/libqdutils/cb_utils.h | 46 + msm8909/libqdutils/comptype.cpp | 33 + msm8909/libqdutils/comptype.h | 81 + msm8909/libqdutils/display_config.cpp | 191 ++ msm8909/libqdutils/display_config.h | 101 + msm8909/libqdutils/idle_invalidator.cpp | 149 ++ msm8909/libqdutils/idle_invalidator.h | 59 + msm8909/libqdutils/mdp_version.cpp | 489 +++++ msm8909/libqdutils/mdp_version.h | 182 ++ msm8909/libqdutils/profiler.cpp | 197 ++ msm8909/libqdutils/profiler.h | 108 + msm8909/libqdutils/qdMetaData.cpp | 104 + msm8909/libqdutils/qdMetaData.h | 114 ++ msm8909/libqdutils/qd_utils.cpp | 123 ++ msm8909/libqdutils/qd_utils.h | 62 + msm8909/libqservice/Android.mk | 19 + msm8909/libqservice/IQClient.cpp | 82 + msm8909/libqservice/IQClient.h | 55 + msm8909/libqservice/IQService.cpp | 136 ++ msm8909/libqservice/IQService.h | 106 + msm8909/libqservice/QService.cpp | 84 + msm8909/libqservice/QService.h | 59 + msm8909/libqservice/QServiceUtils.h | 94 + msm8994/libhwcomposer/hwc.cpp | 31 + msm8994/libhwcomposer/hwc_utils.cpp | 2 + msm8994/libhwcomposer/hwc_utils.h | 2 + 118 files changed, 30811 insertions(+), 5 deletions(-) f1812e0 Enable color temperature developer setting 48857cd display: edo panel: display quality optimization e198c38 DO NOT MERGE display: HAL: FB pipe type select 07bbf1e msm8909: Populate display code for msm8x09 f48303a overlay: Allow to set target specific max rot session 4c9a29a gralloc: Default flexible YUV format to NV21_ZSL a7e7e0a set some qdhwcomposer setPowerMode logs to verbse ========platform/hardware/qcom/gps between android-6.0.1_r46..android-6.0.1_r54========= Android.mk | 5 +- msm8909/CleanSpec.mk | 50 + msm8909/Makefile.am | 10 + msm8909/configure.ac | 85 + msm8909/core/Android.mk | 58 + msm8909/core/ContextBase.cpp | 114 + msm8909/core/ContextBase.h | 74 + msm8909/core/LBSProxyBase.h | 65 + msm8909/core/LocAdapterBase.cpp | 142 + msm8909/core/LocAdapterBase.h | 119 + msm8909/core/LocAdapterProxyBase.h | 70 + msm8909/core/LocApiBase.cpp | 553 ++++ msm8909/core/LocApiBase.h | 261 ++ msm8909/core/LocDualContext.cpp | 147 + msm8909/core/LocDualContext.h | 76 + msm8909/core/UlpProxyBase.h | 84 + msm8909/core/gps_extended.h | 92 + msm8909/core/gps_extended_c.h | 435 +++ msm8909/core/loc_core_log.cpp | 243 ++ msm8909/core/loc_core_log.h | 58 + msm8909/etc/Android.mk | 12 + msm8909/etc/gps.conf | 117 + msm8909/loc-api.pc.in | 10 + msm8909/loc_api/Android.mk | 17 + msm8909/loc_api/libloc_api-rpc-50001/Android.mk | 3 + .../libloc_api-rpc-glue/Android.mk | 60 + .../libloc_api-rpc-glue/Makefile.am | 46 + .../libloc_api-rpc-glue/rpc_inc/LocApiRpc.h | 140 + .../libloc_api-rpc-glue/rpc_inc/debug.h | 69 + .../libloc_api-rpc-glue/rpc_inc/loc_api_fixup.h | 226 ++ .../libloc_api-rpc-glue/rpc_inc/loc_api_log.h | 59 + .../libloc_api-rpc-glue/rpc_inc/loc_api_rpc_glue.h | 123 + .../rpc_inc/loc_api_sync_call.h | 90 + .../rpc_inc/loc_apicb_appinit.h | 45 + .../libloc_api-rpc-glue/src/LocApiRpc.cpp | 1465 ++++++++++ .../libloc_api-rpc-glue/src/loc_api_fixup.c | 52 + .../libloc_api-rpc-glue/src/loc_api_log.c | 345 +++ .../libloc_api-rpc-glue/src/loc_api_rpc_glue.c | 636 +++++ .../libloc_api-rpc-glue/src/loc_api_sync_call.c | 565 ++++ .../libloc_api-rpc-glue/src/loc_apicb_appinit.c | 86 + .../libloc_api-rpc-stub/Android.mk | 36 + .../libloc_api-rpc-stub/Makefile.am | 42 + .../inc/loc_api_rpcgen_cb_rpc.h | 156 + .../inc/loc_api_rpcgen_common_rpc.h | 1261 ++++++++ .../libloc_api-rpc-stub/inc/loc_api_rpcgen_rpc.h | 288 ++ .../libloc_api-rpc-stub/inc/loc_apicb_appinit.h | 34 + .../src/loc_api_rpcgen_cb_svc.c | 327 +++ .../src/loc_api_rpcgen_cb_xdr.c | 60 + .../libloc_api-rpc-stub/src/loc_api_rpcgen_clnt.c | 155 + .../src/loc_api_rpcgen_common_xdr.c | 1775 ++++++++++++ .../libloc_api-rpc-stub/src/loc_api_rpcgen_xdr.c | 199 ++ .../libloc_api-rpc-stub/src/loc_apicb_appinit.c | 74 + .../libloc_api-rpc-stub/xdr/loc_api.xdr | 261 ++ .../libloc_api-rpc-stub/xdr/loc_api_cb.xdr | 187 ++ .../libloc_api-rpc-stub/xdr/loc_api_common.xdr | 1021 +++++++ msm8909/loc_api/libloc_api_50001/Android.mk | 106 + msm8909/loc_api/libloc_api_50001/LocEngAdapter.cpp | 544 ++++ msm8909/loc_api/libloc_api_50001/LocEngAdapter.h | 351 +++ msm8909/loc_api/libloc_api_50001/Makefile.am | 76 + msm8909/loc_api/libloc_api_50001/gps.c | 73 + msm8909/loc_api/libloc_api_50001/loc.cpp | 1077 +++++++ msm8909/loc_api/libloc_api_50001/loc.h | 66 + msm8909/loc_api/libloc_api_50001/loc_eng.cpp | 2999 ++++++++++++++++++++ msm8909/loc_api/libloc_api_50001/loc_eng.h | 270 ++ msm8909/loc_api/libloc_api_50001/loc_eng_agps.cpp | 970 +++++++ msm8909/loc_api/libloc_api_50001/loc_eng_agps.h | 431 +++ .../loc_api/libloc_api_50001/loc_eng_dmn_conn.cpp | 270 ++ .../loc_api/libloc_api_50001/loc_eng_dmn_conn.h | 59 + .../libloc_api_50001/loc_eng_dmn_conn_glue_msg.c | 223 ++ .../libloc_api_50001/loc_eng_dmn_conn_glue_msg.h | 51 + .../libloc_api_50001/loc_eng_dmn_conn_glue_pipe.c | 214 ++ .../libloc_api_50001/loc_eng_dmn_conn_glue_pipe.h | 50 + .../libloc_api_50001/loc_eng_dmn_conn_handler.cpp | 237 ++ .../libloc_api_50001/loc_eng_dmn_conn_handler.h | 106 + .../loc_eng_dmn_conn_thread_helper.c | 399 +++ .../loc_eng_dmn_conn_thread_helper.h | 74 + msm8909/loc_api/libloc_api_50001/loc_eng_log.cpp | 35 + msm8909/loc_api/libloc_api_50001/loc_eng_log.h | 44 + msm8909/loc_api/libloc_api_50001/loc_eng_msg.h | 306 ++ msm8909/loc_api/libloc_api_50001/loc_eng_ni.cpp | 414 +++ msm8909/loc_api/libloc_api_50001/loc_eng_ni.h | 59 + msm8909/loc_api/libloc_api_50001/loc_eng_nmea.cpp | 814 ++++++ msm8909/loc_api/libloc_api_50001/loc_eng_nmea.h | 43 + msm8909/loc_api/libloc_api_50001/loc_eng_xtra.cpp | 213 ++ msm8909/loc_api/libloc_api_50001/loc_eng_xtra.h | 47 + msm8909/utils/Android.mk | 71 + msm8909/utils/LocHeap.cpp | 354 +++ msm8909/utils/LocHeap.h | 96 + msm8909/utils/LocSharedLock.h | 58 + msm8909/utils/LocThread.cpp | 264 ++ msm8909/utils/LocThread.h | 92 + msm8909/utils/LocTimer.cpp | 737 +++++ msm8909/utils/LocTimer.h | 74 + msm8909/utils/Makefile.am | 44 + msm8909/utils/MsgTask.cpp | 102 + msm8909/utils/MsgTask.h | 67 + msm8909/utils/linked_list.c | 328 +++ msm8909/utils/linked_list.h | 217 ++ msm8909/utils/loc_cfg.cpp | 400 +++ msm8909/utils/loc_cfg.h | 91 + msm8909/utils/loc_log.cpp | 242 ++ msm8909/utils/loc_log.h | 71 + msm8909/utils/loc_misc_utils.cpp | 114 + msm8909/utils/loc_misc_utils.h | 99 + msm8909/utils/loc_target.cpp | 261 ++ msm8909/utils/loc_target.h | 82 + msm8909/utils/loc_timer.h | 73 + msm8909/utils/log_util.h | 189 ++ msm8909/utils/msg_q.c | 336 +++ msm8909/utils/msg_q.h | 207 ++ .../elapsed_millis_since_boot.cpp | 46 + .../platform_lib_includes.h | 35 + .../platform_lib_macros.h | 81 + .../platform_lib_abstractions/platform_lib_time.h | 35 + 114 files changed, 28269 insertions(+), 1 deletion(-) e7c9864 gps: msm8909w caf release LW.BR.1.0-00410-8x09w.0 ========platform/hardware/qcom/keymaster between android-6.0.1_r46..android-6.0.1_r54========= Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 888834f Remove legacy keymaster support for msm8226 ========platform/hardware/qcom/media between android-6.0.1_r46..android-6.0.1_r54========= mm-video-v4l2/vidc/common/inc/vidc_debug.h | 14 +++++++++ mm-video-v4l2/vidc/vdec.mk | 1 + mm-video-v4l2/vidc/vdec/inc/omx_vdec.h | 1 + mm-video-v4l2/vidc/vdec/src/omx_vdec_msm8974.cpp | 37 +++++++++++++++--------- mm-video-v4l2/vidc/venc/src/omx_video_base.cpp | 22 ++++++++++---- 5 files changed, 56 insertions(+), 19 deletions(-) aa47921 DO NOT MERGE mm-video-v4l2: venc: Avoid processing ETBs/FTBs in invalid states 5f9993f DO NOT MERGE mm-video-v4l2: vdec: Avoid processing ETBs/FTBs in invalid states 2622da4 DO NOT MERGE mm-video-v4l2: venc: add safety checks for freeing buffers 1a0ecf2 DO NOT MERGE mm-video-v4l2: vdec: add safety checks for freeing buffers 2beb871 DO NOT MERGE mm-video-v4l2: vdec: deprecate unused config OMX_IndexVendorVideoExtraData c98c7ec DO NOT MERGE mm-video-v4l2: vidc: validate omx param/config data 2cd19ff mm-video-v4l2: vdec: disable cached allocation for input ========platform/hardware/qcom/msm8x26 between android-6.0.1_r46..android-6.0.1_r54========= kernel-headers/linux/msm_audio_calibration.h | 616 +++++++++++---------- kernel-headers/linux/msm_rmnet.h | 197 +++---- kernel-headers/linux/rmnet_data.h | 131 +++++ kernel-headers/sound/lsm_params.h | 101 +++- .../linux/msm_audio_calibration.h | 56 +- original-kernel-headers/linux/msm_rmnet.h | 3 +- original-kernel-headers/linux/rmnet_data.h | 246 ++++++++ original-kernel-headers/sound/lsm_params.h | 106 +++- 8 files changed, 1032 insertions(+), 424 deletions(-) 8b098e3 msm8x26: Update audio headers bc5e7a0 msm8x26: Update rmnet header ========platform/hardware/qcom/wlan between android-6.0.1_r46..android-6.0.1_r54========= qcwcn/wifi_hal/cpp_bindings.cpp | 3 +++ 1 file changed, 3 insertions(+) f0c9628 Fix leaked nl_msg objects ========platform/libcore between android-6.0.1_r46..android-6.0.1_r54========= .../bouncycastle/crypto/digests/DigestTest.java | 33 +++++---- .../java/libcore/java/lang/ref/FinalizeTest.java | 9 ++- .../java/libcore/javax/net/ssl/SSLSessionTest.java | 2 +- .../java/libcore/javax/net/ssl/SSLSocketTest.java | 18 ++++- .../libcore/tlswire/handshake/HelloExtension.java | 3 +- .../test/java/tests/util/SummaryStatistics.java | 82 ++++++++++++++++++++++ 6 files changed, 130 insertions(+), 17 deletions(-) 3bf65a5 CipherTest: add test for multiple updateAAD calls 955b4fa CipherTest: test instance reuse with updateAAD b307d35 GCMParameters: check that the default tag size is secure (16 bits) e7bdc26 Check for RFC 5746 TLS extension 161ab7a Change FinalizeTest to use helper function 36363b0 Fix time calculation in test_SSLSession_getLastAccessedTime ef2d585 Add more debugging to the DigestTest dd303ca Patch for awaitNanos() for coarse-grained clocks ========platform/packages/apps/Bluetooth between android-6.0.1_r46..android-6.0.1_r54========= ..._android_bluetooth_btservice_AdapterService.cpp | 32 +-- res/values-af/strings.xml | 9 +- res/values-am/strings.xml | 9 +- res/values-ar/strings.xml | 17 +- res/values-az-rAZ/strings.xml | 23 +- res/values-az-rAZ/strings_sap.xml | 10 - res/values-bg/strings.xml | 11 +- res/values-bn-rBD/strings.xml | 9 +- res/values-ca/strings.xml | 33 +-- res/values-ca/test_strings.xml | 2 +- res/values-cs/strings.xml | 19 +- res/values-da/strings.xml | 33 +-- res/values-da/test_strings.xml | 2 +- res/values-de/strings.xml | 9 +- res/values-el/strings.xml | 19 +- res/values-en-rAU/strings.xml | 11 +- res/values-en-rGB/strings.xml | 11 +- res/values-en-rIN/strings.xml | 11 +- res/values-es-rUS/strings.xml | 25 +- res/values-es/strings.xml | 11 +- res/values-et-rEE/strings.xml | 9 +- res/values-eu-rES/strings.xml | 9 +- res/values-fa/strings.xml | 15 +- res/values-fa/test_strings.xml | 2 +- res/values-fi/strings.xml | 11 +- res/values-fr-rCA/strings.xml | 9 +- res/values-fr/strings.xml | 11 +- res/values-gl-rES/strings.xml | 9 +- res/values-gu-rIN/strings.xml | 9 +- res/values-hi/strings.xml | 13 +- res/values-hr/strings.xml | 19 +- res/values-hu/strings.xml | 19 +- res/values-hy-rAM/strings.xml | 9 +- res/values-in/strings.xml | 21 +- res/values-in/test_strings.xml | 2 +- res/values-is-rIS/strings.xml | 9 +- res/values-it/strings.xml | 29 +-- res/values-iw/strings.xml | 13 +- res/values-ja/strings.xml | 11 +- res/values-ka-rGE/strings.xml | 9 +- res/values-kk-rKZ/strings.xml | 25 +- res/values-km-rKH/strings.xml | 9 +- res/values-kn-rIN/strings.xml | 17 +- res/values-ko/strings.xml | 9 +- res/values-ky-rKG/strings.xml | 9 +- res/values-lo-rLA/strings.xml | 9 +- res/values-lt/strings.xml | 17 +- res/values-lv/strings.xml | 11 +- res/values-mk-rMK/strings.xml | 9 +- res/values-ml-rIN/strings.xml | 13 +- res/values-mn-rMN/strings.xml | 9 +- res/values-mr-rIN/strings.xml | 43 ++-- res/values-mr-rIN/strings_pbap.xml | 2 +- res/values-mr-rIN/test_strings.xml | 2 +- res/values-ms-rMY/strings.xml | 9 +- res/values-my-rMM/strings.xml | 9 +- res/values-nb/strings.xml | 19 +- res/values-ne-rNP/strings.xml | 9 +- res/values-nl/strings.xml | 29 +-- res/values-pa-rIN/strings.xml | 9 +- res/values-pl/strings.xml | 21 +- res/values-pt-rPT/strings.xml | 9 +- res/values-pt/strings.xml | 9 +- res/values-ro/strings.xml | 25 +- res/values-ru/strings.xml | 13 +- res/values-si-rLK/strings.xml | 9 +- res/values-sk/strings.xml | 43 ++-- res/values-sl/strings.xml | 29 +-- res/values-sl/test_strings.xml | 2 +- res/values-sq-rAL/strings.xml | 27 +-- res/values-sr/strings.xml | 15 +- res/values-sv/strings.xml | 13 +- res/values-sw/strings.xml | 9 +- res/values-ta-rIN/strings.xml | 13 +- res/values-te-rIN/strings.xml | 11 +- res/values-th/strings.xml | 11 +- res/values-tl/strings.xml | 15 +- res/values-tr/strings.xml | 9 +- res/values-uk/strings.xml | 35 +-- res/values-ur-rPK/strings.xml | 13 +- res/values-uz-rUZ/strings.xml | 65 +++-- res/values-uz-rUZ/test_strings.xml | 2 +- res/values-vi/strings.xml | 9 +- res/values-zh-rCN/strings.xml | 9 +- res/values-zh-rHK/strings.xml | 9 +- res/values-zh-rTW/strings.xml | 19 +- res/values-zu/strings.xml | 9 +- res/values/config.xml | 13 +- src/com/android/bluetooth/a2dp/A2dpService.java | 4 - src/com/android/bluetooth/avrcp/Avrcp.java | 269 +++------------------ .../bluetooth/btservice/AdapterService.java | 74 +----- .../android/bluetooth/btservice/AdapterState.java | 4 +- .../bluetooth/btservice/BondStateMachine.java | 4 - src/com/android/bluetooth/btservice/Config.java | 48 +++- .../bluetooth/btservice/ProfileObserver.java | 69 ++++++ src/com/android/bluetooth/gatt/GattService.java | 8 +- src/com/android/bluetooth/hfp/HeadsetService.java | 23 ++ .../android/bluetooth/hfp/HeadsetStateMachine.java | 13 +- .../bluetooth/hfpclient/HeadsetClientService.java | 26 ++ .../hfpclient/HeadsetClientStateMachine.java | 92 +++---- .../android/bluetooth/map/BluetoothMapUtils.java | 7 +- 101 files changed, 599 insertions(+), 1320 deletions(-) 4eb8e73 Add guest mode functionality (3/3) 4de11a6 "DO NOT MERGE" Add write SMS protection 1983bcc DO NOT MERGE Fix SMS delivered successfully but stuck SENDING issue 3a4b869 Fix memory leak in Bluetooth AVRCP JNI 0a9659d Map Bluetooth profiles correctly in isProfileDisabled helper function. 3602a64 Monitor disabled profile setting and enable/disable profiles on change. 9e1b34b Allow for automatic routing on HF AG to be disabled. 22bb394 Implement setting/getting whether audio can be routed to the HFP HF device. 84d1aab Revert "Allow HFP HF implementations to specify a client controller." 8843d8a Allow HFP HF implementations to specify a client controller. 65842bf Remove receiver status foreground flag 371e204 Allow for supported profiles to be reloaded on enable. 5040e76 Only apply foreground flag for audio state connected 5d0f297 Add FLAG_RECEIVER_FOREGROUND to audio state broadcasts 7618faa Avoid NPE when dumping headset profile state. 9379389 Read connection intervals from config.xml so it can be overriden by device. a27628d Send the AUDIO_CONNECTED broadcast after switching to the AudioOn state. 157a5b4 HFP should let the system handle ringtones 3760400 Fix low volume on Nemo devices after accepting incoming HFP call. a0f6ccc Remove extra logging with privacy info DO NOT MERGE ========platform/packages/apps/CarrierConfig between android-6.0.1_r46..android-6.0.1_r54========= assets/carrier_config_20404.xml | 1 + assets/carrier_config_310004.xml | 1 + assets/carrier_config_311480.xml | 1 + 3 files changed, 3 insertions(+) 32a3bfa DO NOT MERGE Set broadcast_emergency_call_state_changes_bool to true for VZW ========platform/packages/apps/CertInstaller between android-6.0.1_r46..android-6.0.1_r54========= res/values-af/strings.xml | 10 --- res/values-am/strings.xml | 10 --- res/values-ar/strings.xml | 12 +--- res/values-az-rAZ/strings.xml | 22 ------ res/values-bg/strings.xml | 12 +--- res/values-bn-rBD/strings.xml | 10 --- res/values-ca/strings.xml | 12 +--- res/values-cs/strings.xml | 10 --- res/values-da/strings.xml | 10 --- res/values-de/strings.xml | 10 --- res/values-el/strings.xml | 10 --- res/values-en-rAU/strings.xml | 10 --- res/values-en-rGB/strings.xml | 10 --- res/values-en-rIN/strings.xml | 10 --- res/values-es-rUS/strings.xml | 14 +--- res/values-es/strings.xml | 12 +--- res/values-et-rEE/strings.xml | 10 --- res/values-eu-rES/strings.xml | 10 --- res/values-fa/strings.xml | 18 ++--- res/values-fi/strings.xml | 12 +--- res/values-fr-rCA/strings.xml | 10 --- res/values-fr/strings.xml | 10 --- res/values-gl-rES/strings.xml | 10 --- res/values-gu-rIN/strings.xml | 12 +--- res/values-hi/strings.xml | 10 --- res/values-hr/strings.xml | 12 +--- res/values-hu/strings.xml | 10 --- res/values-hy-rAM/strings.xml | 10 --- res/values-in/strings.xml | 10 --- res/values-is-rIS/strings.xml | 10 --- res/values-it/strings.xml | 14 +--- res/values-iw/strings.xml | 10 --- res/values-ja/strings.xml | 12 +--- res/values-ka-rGE/strings.xml | 10 --- res/values-kk-rKZ/strings.xml | 12 +--- res/values-km-rKH/strings.xml | 10 --- res/values-kn-rIN/strings.xml | 10 --- res/values-ko/strings.xml | 10 --- res/values-ky-rKG/strings.xml | 61 +++++++++-------- res/values-lo-rLA/strings.xml | 10 --- res/values-lt/strings.xml | 12 +--- res/values-lv/strings.xml | 12 +--- res/values-mk-rMK/strings.xml | 10 --- res/values-ml-rIN/strings.xml | 18 ++--- res/values-mn-rMN/strings.xml | 10 --- res/values-mr-rIN/strings.xml | 10 --- res/values-ms-rMY/strings.xml | 12 +--- res/values-my-rMM/strings.xml | 10 --- res/values-nb/strings.xml | 12 +--- res/values-ne-rNP/strings.xml | 10 --- res/values-nl/strings.xml | 14 +--- res/values-pa-rIN/strings.xml | 10 --- res/values-pl/strings.xml | 10 --- res/values-pt-rBR/strings.xml | 78 ---------------------- res/values-pt-rPT/strings.xml | 10 --- res/values-pt/strings.xml | 10 --- res/values-ro/strings.xml | 12 +--- res/values-ru/strings.xml | 14 +--- res/values-si-rLK/strings.xml | 10 --- res/values-sk/strings.xml | 20 ++---- res/values-sl/strings.xml | 12 +--- res/values-sq-rAL/strings.xml | 10 --- res/values-sr/strings.xml | 10 --- res/values-sv/strings.xml | 10 --- res/values-sw/strings.xml | 10 --- res/values-ta-rIN/strings.xml | 12 +--- res/values-te-rIN/strings.xml | 10 --- res/values-th/strings.xml | 12 +--- res/values-tl/strings.xml | 10 --- res/values-tr/strings.xml | 10 --- res/values-uk/strings.xml | 14 +--- res/values-ur-rPK/strings.xml | 10 --- res/values-uz-rUZ/strings.xml | 24 ++----- res/values-vi/strings.xml | 10 --- res/values-zh-rCN/strings.xml | 10 --- res/values-zh-rHK/strings.xml | 10 --- res/values-zh-rTW/strings.xml | 10 --- res/values-zu/strings.xml | 10 --- src/com/android/certinstaller/CertInstaller.java | 4 +- .../android/certinstaller/CredentialHelper.java | 15 ++++- 80 files changed, 97 insertions(+), 927 deletions(-) ae7438e Trust CA certificates added for the whole OS only 958f46f Import translations. DO NOT MERGE 33c079a Nemo CTS: Call the right class for SSL ========platform/packages/apps/ContactsCommon between android-6.0.1_r46..android-6.0.1_r54========= res/values-fa/strings.xml | 2 +- res/values-ro/strings.xml | 10 +++++----- res/values-zh-rCN/strings.xml | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) 3f2006a Import translations. DO NOT MERGE cab7db5 Import translations. DO NOT MERGE 47fda83 Import translations. DO NOT MERGE ========platform/packages/apps/Email between android-6.0.1_r46..android-6.0.1_r54========= res/values-az-rAZ/strings.xml | 242 ------------------------------------------ res/values-bg/strings.xml | 2 +- res/values-bn-rBD/strings.xml | 10 +- res/values-ca/strings.xml | 2 +- res/values-de/strings.xml | 2 +- res/values-es/strings.xml | 4 +- res/values-eu-rES/strings.xml | 8 +- res/values-fa/strings.xml | 4 +- res/values-fi/strings.xml | 6 +- res/values-hu/strings.xml | 2 +- res/values-hy-rAM/strings.xml | 2 +- res/values-it/strings.xml | 2 +- res/values-kn-rIN/strings.xml | 6 +- res/values-lt/strings.xml | 2 +- res/values-ml-rIN/strings.xml | 18 ++-- res/values-ms-rMY/strings.xml | 2 +- res/values-nb/strings.xml | 4 +- res/values-nl/strings.xml | 2 +- res/values-pl/strings.xml | 2 +- res/values-pt-rPT/strings.xml | 2 +- res/values-sk/strings.xml | 2 +- res/values-ur-rPK/strings.xml | 2 +- 22 files changed, 43 insertions(+), 285 deletions(-) b65d462 Don't allow cachedFile Attachments if the content Uri is pointing to EmailProvider. ========platform/packages/apps/InCallUI between android-6.0.1_r46..android-6.0.1_r54========= res/values-af/strings.xml | 7 +- res/values-am/strings.xml | 7 +- res/values-ar/strings.xml | 7 +- res/values-az-rAZ/strings.xml | 127 ++++++++----------- res/values-bg/strings.xml | 7 +- res/values-bn-rBD/strings.xml | 9 +- res/values-ca/strings.xml | 27 ++--- res/values-cs/strings.xml | 9 +- res/values-da/strings.xml | 7 +- res/values-de/strings.xml | 15 +-- res/values-el/strings.xml | 7 +- res/values-en-rAU/strings.xml | 7 +- res/values-en-rGB/strings.xml | 7 +- res/values-en-rIN/strings.xml | 7 +- res/values-es-rUS/strings.xml | 13 +- res/values-es/strings.xml | 9 +- res/values-et-rEE/strings.xml | 7 +- res/values-eu-rES/strings.xml | 7 +- res/values-fa/strings.xml | 25 ++-- res/values-fi/strings.xml | 11 +- res/values-fr-rCA/strings.xml | 7 +- res/values-fr/strings.xml | 7 +- res/values-gl-rES/strings.xml | 9 +- res/values-gu-rIN/strings.xml | 7 +- res/values-hi/strings.xml | 9 +- res/values-hr/strings.xml | 9 +- res/values-hu/strings.xml | 15 +-- res/values-hy-rAM/strings.xml | 9 +- res/values-in/strings.xml | 9 +- res/values-is-rIS/strings.xml | 7 +- res/values-it/strings.xml | 11 +- res/values-iw/strings.xml | 7 +- res/values-ja/strings.xml | 9 +- res/values-ka-rGE/strings.xml | 7 +- res/values-kk-rKZ/strings.xml | 174 --------------------------- res/values-km-rKH/strings.xml | 7 +- res/values-kn-rIN/strings.xml | 15 +-- res/values-ko/strings.xml | 7 +- res/values-ky-rKG/strings.xml | 174 --------------------------- res/values-lo-rLA/strings.xml | 7 +- res/values-lt/strings.xml | 9 +- res/values-lv/strings.xml | 9 +- res/values-mk-rMK/strings.xml | 174 --------------------------- res/values-ml-rIN/strings.xml | 17 ++- res/values-mn-rMN/strings.xml | 7 +- res/values-mr-rIN/strings.xml | 11 +- res/values-ms-rMY/strings.xml | 11 +- res/values-my-rMM/strings.xml | 7 +- res/values-nb/strings.xml | 17 ++- res/values-ne-rNP/strings.xml | 7 +- res/values-nl/strings.xml | 15 +-- res/values-pa-rIN/strings.xml | 174 --------------------------- res/values-pl/strings.xml | 9 +- res/values-pt-rPT/strings.xml | 9 +- res/values-pt/strings.xml | 7 +- res/values-ro/strings.xml | 35 +++--- res/values-ru/strings.xml | 11 +- res/values-si-rLK/strings.xml | 7 +- res/values-sk/strings.xml | 21 ++-- res/values-sl/strings.xml | 9 +- res/values-sq-rAL/strings.xml | 174 --------------------------- res/values-sr/strings.xml | 11 +- res/values-sv/strings.xml | 9 +- res/values-sw/strings.xml | 9 +- res/values-ta-rIN/strings.xml | 11 +- res/values-te-rIN/strings.xml | 11 +- res/values-th/strings.xml | 11 +- res/values-tl/strings.xml | 9 +- res/values-tr/strings.xml | 9 +- res/values-uk/strings.xml | 25 ++-- res/values-ur-rPK/strings.xml | 11 +- res/values-uz-rUZ/strings.xml | 174 --------------------------- res/values-vi/strings.xml | 11 +- res/values-zh-rCN/strings.xml | 7 +- res/values-zh-rHK/strings.xml | 7 +- res/values-zh-rTW/strings.xml | 7 +- res/values-zu/strings.xml | 7 +- src/com/android/incallui/Call.java | 114 +++++++++++------- tests/src/com/android/incallui/CallTest.java | 125 +++++++++++++++++++ 79 files changed, 502 insertions(+), 1634 deletions(-) a94a117 DO NOT MERGE Workaround for java.lang.IllegalArgumentException in android.util.ArrayMap 2e5cfc1 Show child number in incoming call notification. ========platform/packages/apps/Launcher3 between android-6.0.1_r46..android-6.0.1_r54========= WallpaperPicker/res/values-fa/strings.xml | 2 +- WallpaperPicker/res/values-hr/strings.xml | 4 ++-- WallpaperPicker/res/values-kk-rKZ/strings.xml | 2 +- WallpaperPicker/res/values-uz-rUZ/strings.xml | 2 +- res/values-hr/strings.xml | 2 +- res/values-uz-rUZ/strings.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) 2c29ac6 Import translations. DO NOT MERGE c81b061 Import translations. DO NOT MERGE c1ac011 Import translations. DO NOT MERGE 8140396 Import translations. DO NOT MERGE 01614d6 Import translations. DO NOT MERGE c4d66cf Import translations. DO NOT MERGE ========platform/packages/apps/ManagedProvisioning between android-6.0.1_r46..android-6.0.1_r54========= res/values-af/strings.xml | 79 ++++++++++++++----------------- res/values-am/strings.xml | 79 ++++++++++++++----------------- res/values-ar/strings.xml | 79 ++++++++++++++----------------- res/values-az-rAZ/strings.xml | 101 --------------------------------------- res/values-bg/strings.xml | 79 ++++++++++++++----------------- res/values-bn-rBD/strings.xml | 79 ++++++++++++++----------------- res/values-ca/strings.xml | 81 ++++++++++++++------------------ res/values-cs/strings.xml | 79 ++++++++++++++----------------- res/values-da/strings.xml | 79 ++++++++++++++----------------- res/values-de/strings.xml | 79 ++++++++++++++----------------- res/values-el/strings.xml | 79 ++++++++++++++----------------- res/values-en-rAU/strings.xml | 79 ++++++++++++++----------------- res/values-en-rGB/strings.xml | 79 ++++++++++++++----------------- res/values-en-rIN/strings.xml | 79 ++++++++++++++----------------- res/values-es-rUS/strings.xml | 79 ++++++++++++++----------------- res/values-es/strings.xml | 79 ++++++++++++++----------------- res/values-et-rEE/strings.xml | 79 ++++++++++++++----------------- res/values-eu-rES/strings.xml | 79 ++++++++++++++----------------- res/values-fa/strings.xml | 83 ++++++++++++++------------------ res/values-fi/strings.xml | 79 ++++++++++++++----------------- res/values-fr-rCA/strings.xml | 79 ++++++++++++++----------------- res/values-fr/strings.xml | 79 ++++++++++++++----------------- res/values-gl-rES/strings.xml | 79 ++++++++++++++----------------- res/values-gu-rIN/strings.xml | 81 ++++++++++++++------------------ res/values-hi/strings.xml | 79 ++++++++++++++----------------- res/values-hr/strings.xml | 81 ++++++++++++++------------------ res/values-hu/strings.xml | 79 ++++++++++++++----------------- res/values-hy-rAM/strings.xml | 79 ++++++++++++++----------------- res/values-in/strings.xml | 79 ++++++++++++++----------------- res/values-is-rIS/strings.xml | 79 ++++++++++++++----------------- res/values-it/strings.xml | 81 ++++++++++++++------------------ res/values-iw/strings.xml | 81 ++++++++++++++------------------ res/values-ja/strings.xml | 91 ++++++++++++++++------------------- res/values-ka-rGE/strings.xml | 79 ++++++++++++++----------------- res/values-kk-rKZ/strings.xml | 79 ++++++++++++++----------------- res/values-km-rKH/strings.xml | 79 ++++++++++++++----------------- res/values-kn-rIN/strings.xml | 81 ++++++++++++++------------------ res/values-ko/strings.xml | 79 ++++++++++++++----------------- res/values-ky-rKG/strings.xml | 79 ++++++++++++++----------------- res/values-lo-rLA/strings.xml | 79 ++++++++++++++----------------- res/values-lt/strings.xml | 79 ++++++++++++++----------------- res/values-lv/strings.xml | 79 ++++++++++++++----------------- res/values-mk-rMK/strings.xml | 79 ++++++++++++++----------------- res/values-ml-rIN/strings.xml | 81 ++++++++++++++------------------ res/values-mn-rMN/strings.xml | 79 ++++++++++++++----------------- res/values-mr-rIN/strings.xml | 79 ++++++++++++++----------------- res/values-ms-rMY/strings.xml | 79 ++++++++++++++----------------- res/values-my-rMM/strings.xml | 79 ++++++++++++++----------------- res/values-nb/strings.xml | 81 ++++++++++++++------------------ res/values-ne-rNP/strings.xml | 79 ++++++++++++++----------------- res/values-nl/strings.xml | 107 +++++++++++++++++++----------------------- res/values-pa-rIN/strings.xml | 79 ++++++++++++++----------------- res/values-pl/strings.xml | 79 ++++++++++++++----------------- res/values-pt-rBR/strings.xml | 101 --------------------------------------- res/values-pt-rPT/strings.xml | 79 ++++++++++++++----------------- res/values-pt/strings.xml | 79 ++++++++++++++----------------- res/values-ro/strings.xml | 79 ++++++++++++++----------------- res/values-ru/strings.xml | 79 ++++++++++++++----------------- res/values-si-rLK/strings.xml | 79 ++++++++++++++----------------- res/values-sk/strings.xml | 79 ++++++++++++++----------------- res/values-sl/strings.xml | 79 ++++++++++++++----------------- res/values-sq-rAL/strings.xml | 87 +++++++++++++++------------------- res/values-sr/strings.xml | 79 ++++++++++++++----------------- res/values-sv/strings.xml | 79 ++++++++++++++----------------- res/values-sw/strings.xml | 79 ++++++++++++++----------------- res/values-ta-rIN/strings.xml | 79 ++++++++++++++----------------- res/values-te-rIN/strings.xml | 79 ++++++++++++++----------------- res/values-th/strings.xml | 79 ++++++++++++++----------------- res/values-tl/strings.xml | 79 ++++++++++++++----------------- res/values-tr/strings.xml | 79 ++++++++++++++----------------- res/values-uk/strings.xml | 79 ++++++++++++++----------------- res/values-ur-rPK/strings.xml | 79 ++++++++++++++----------------- res/values-uz-rUZ/strings.xml | 79 ++++++++++++++----------------- res/values-vi/strings.xml | 79 ++++++++++++++----------------- res/values-zh-rCN/strings.xml | 81 ++++++++++++++------------------ res/values-zh-rHK/strings.xml | 79 ++++++++++++++----------------- res/values-zh-rTW/strings.xml | 81 ++++++++++++++------------------ res/values-zu/strings.xml | 79 ++++++++++++++----------------- 78 files changed, 2620 insertions(+), 3658 deletions(-) 5e71956 Import translations. DO NOT MERGE ========platform/packages/apps/Nfc between android-6.0.1_r46..android-6.0.1_r54========= res/values-az-rAZ/provisioning.xml | 26 -------------------------- res/values-az-rAZ/strings.xml | 31 +++++++------------------------ res/values-ca/strings.xml | 6 +++--- res/values-fa/strings.xml | 4 ++-- res/values-ja/strings.xml | 2 +- res/values-ml-rIN/strings.xml | 2 +- res/values-mr-rIN/strings.xml | 4 ++-- res/values-nl/strings.xml | 8 ++++---- res/values-ro/strings.xml | 2 +- res/values-ru/strings.xml | 2 +- src/com/android/nfc/NfcService.java | 10 +++++++++- 11 files changed, 31 insertions(+), 66 deletions(-) 8764f56 Allow system_server access to NFC reader mode API. da099c1 Verify setForegroundDispatch caller is in foreground. ========platform/packages/apps/PackageInstaller between android-6.0.1_r46..android-6.0.1_r54========= Android.mk | 3 +- AndroidManifest.xml | 26 + res/drawable-watch-280dpi/ic_cc_cancel.png | Bin 0 -> 14774 bytes res/drawable-watch-280dpi/ic_cc_checkmark.png | Bin 0 -> 14840 bytes res/drawable-watch-280dpi/ic_cc_deny.png | Bin 0 -> 18879 bytes .../ic_permission_calendar.png | Bin 0 -> 20425 bytes .../ic_permission_calendardisable.png | Bin 0 -> 18888 bytes res/drawable-watch-280dpi/ic_permission_call.png | Bin 0 -> 20029 bytes .../ic_permission_calldisable.png | Bin 0 -> 18813 bytes res/drawable-watch-280dpi/ic_permission_camera.png | Bin 0 -> 20572 bytes .../ic_permission_cameradisable.png | Bin 0 -> 18391 bytes .../ic_permission_contact.png | Bin 0 -> 19960 bytes .../ic_permission_contactdisable.png | Bin 0 -> 18921 bytes .../ic_permission_location.png | Bin 0 -> 19625 bytes .../ic_permission_locationdisable.png | Bin 0 -> 18803 bytes res/drawable-watch-280dpi/ic_permission_mic.png | Bin 0 -> 20006 bytes .../ic_permission_micdisable.png | Bin 0 -> 20179 bytes res/drawable-watch-280dpi/ic_permission_more.png | Bin 0 -> 19946 bytes res/drawable-watch-280dpi/ic_permission_sensor.png | Bin 0 -> 20622 bytes .../ic_permission_sensordisable.png | Bin 0 -> 20391 bytes res/drawable-watch-280dpi/ic_permission_shield.png | Bin 0 -> 20403 bytes .../ic_permission_shielddisable.png | Bin 0 -> 19978 bytes res/drawable-watch-280dpi/ic_permission_sms.png | Bin 0 -> 20341 bytes .../ic_permission_smsdisable.png | Bin 0 -> 20159 bytes .../ic_permission_storage.png | Bin 0 -> 19814 bytes .../ic_permission_storagedisable.png | Bin 0 -> 20135 bytes res/drawable-watch-hdpi/ic_cc_cancel.png | Bin 0 -> 678 bytes res/drawable-watch-hdpi/ic_cc_checkmark.png | Bin 0 -> 646 bytes res/drawable-watch-hdpi/ic_cc_deny.png | Bin 0 -> 923 bytes res/drawable-watch-hdpi/ic_permission_calendar.png | Bin 0 -> 760 bytes .../ic_permission_calendardisable.png | Bin 0 -> 987 bytes res/drawable-watch-hdpi/ic_permission_call.png | Bin 0 -> 808 bytes .../ic_permission_calldisable.png | Bin 0 -> 940 bytes res/drawable-watch-hdpi/ic_permission_camera.png | Bin 0 -> 676 bytes .../ic_permission_cameradisable.png | Bin 0 -> 979 bytes res/drawable-watch-hdpi/ic_permission_contact.png | Bin 0 -> 717 bytes .../ic_permission_contactdisable.png | Bin 0 -> 989 bytes res/drawable-watch-hdpi/ic_permission_location.png | Bin 0 -> 804 bytes .../ic_permission_locationdisable.png | Bin 0 -> 932 bytes res/drawable-watch-hdpi/ic_permission_mic.png | Bin 0 -> 731 bytes .../ic_permission_micdisable.png | Bin 0 -> 911 bytes res/drawable-watch-hdpi/ic_permission_more.png | Bin 0 -> 579 bytes res/drawable-watch-hdpi/ic_permission_sensor.png | Bin 0 -> 911 bytes .../ic_permission_sensordisable.png | Bin 0 -> 1034 bytes res/drawable-watch-hdpi/ic_permission_shield.png | Bin 0 -> 751 bytes .../ic_permission_shielddisable.png | Bin 0 -> 896 bytes res/drawable-watch-hdpi/ic_permission_sms.png | Bin 0 -> 643 bytes .../ic_permission_smsdisable.png | Bin 0 -> 823 bytes res/drawable-watch-hdpi/ic_permission_storage.png | Bin 0 -> 523 bytes .../ic_permission_storagedisable.png | Bin 0 -> 751 bytes res/drawable-watch-mdpi/ic_cc_cancel.png | Bin 0 -> 535 bytes res/drawable-watch-mdpi/ic_cc_checkmark.png | Bin 0 -> 509 bytes res/drawable-watch-mdpi/ic_cc_deny.png | Bin 0 -> 661 bytes res/drawable-watch-mdpi/ic_permission_calendar.png | Bin 0 -> 608 bytes .../ic_permission_calendardisable.png | Bin 0 -> 708 bytes res/drawable-watch-mdpi/ic_permission_call.png | Bin 0 -> 599 bytes .../ic_permission_calldisable.png | Bin 0 -> 690 bytes res/drawable-watch-mdpi/ic_permission_camera.png | Bin 0 -> 539 bytes .../ic_permission_cameradisable.png | Bin 0 -> 691 bytes res/drawable-watch-mdpi/ic_permission_contact.png | Bin 0 -> 566 bytes .../ic_permission_contactdisable.png | Bin 0 -> 686 bytes res/drawable-watch-mdpi/ic_permission_location.png | Bin 0 -> 586 bytes .../ic_permission_locationdisable.png | Bin 0 -> 673 bytes res/drawable-watch-mdpi/ic_permission_mic.png | Bin 0 -> 561 bytes .../ic_permission_micdisable.png | Bin 0 -> 638 bytes res/drawable-watch-mdpi/ic_permission_more.png | Bin 0 -> 441 bytes res/drawable-watch-mdpi/ic_permission_sensor.png | Bin 0 -> 635 bytes .../ic_permission_sensordisable.png | Bin 0 -> 713 bytes res/drawable-watch-mdpi/ic_permission_shield.png | Bin 0 -> 562 bytes .../ic_permission_shielddisable.png | Bin 0 -> 652 bytes res/drawable-watch-mdpi/ic_permission_sms.png | Bin 0 -> 561 bytes .../ic_permission_smsdisable.png | Bin 0 -> 671 bytes res/drawable-watch-mdpi/ic_permission_storage.png | Bin 0 -> 471 bytes .../ic_permission_storagedisable.png | Bin 0 -> 603 bytes res/drawable-watch-xhdpi/ic_cc_cancel.png | Bin 0 -> 312 bytes res/drawable-watch-xhdpi/ic_cc_checkmark.png | Bin 0 -> 321 bytes res/drawable-watch-xhdpi/ic_cc_deny.png | Bin 0 -> 18778 bytes .../ic_permission_calendar.png | Bin 0 -> 19782 bytes .../ic_permission_calendardisable.png | Bin 0 -> 18211 bytes res/drawable-watch-xhdpi/ic_permission_call.png | Bin 0 -> 19995 bytes .../ic_permission_calldisable.png | Bin 0 -> 18621 bytes res/drawable-watch-xhdpi/ic_permission_camera.png | Bin 0 -> 20027 bytes .../ic_permission_cameradisable.png | Bin 0 -> 18391 bytes res/drawable-watch-xhdpi/ic_permission_contact.png | Bin 0 -> 19471 bytes .../ic_permission_contactdisable.png | Bin 0 -> 18283 bytes .../ic_permission_location.png | Bin 0 -> 19625 bytes .../ic_permission_locationdisable.png | Bin 0 -> 18292 bytes res/drawable-watch-xhdpi/ic_permission_mic.png | Bin 0 -> 19554 bytes .../ic_permission_micdisable.png | Bin 0 -> 19609 bytes res/drawable-watch-xhdpi/ic_permission_more.png | Bin 0 -> 19547 bytes res/drawable-watch-xhdpi/ic_permission_sensor.png | Bin 0 -> 20118 bytes .../ic_permission_sensordisable.png | Bin 0 -> 19703 bytes res/drawable-watch-xhdpi/ic_permission_shield.png | Bin 0 -> 19931 bytes .../ic_permission_shielddisable.png | Bin 0 -> 19978 bytes res/drawable-watch-xhdpi/ic_permission_sms.png | Bin 0 -> 19807 bytes .../ic_permission_smsdisable.png | Bin 0 -> 19499 bytes res/drawable-watch-xhdpi/ic_permission_storage.png | Bin 0 -> 19295 bytes .../ic_permission_storagedisable.png | Bin 0 -> 19443 bytes res/drawable-watch/action_negative_bg.xml | 35 + res/drawable-watch/action_positive_bg.xml | 35 + res/drawable-watch/cancel_button.xml | 21 + res/drawable-watch/confirm_button.xml | 21 + res/drawable-watch/deny_button.xml | 21 + res/drawable/ic_dialog_alert_material.xml | 25 + res/drawable/ic_info.xml | 3 +- res/drawable/ic_more_items.xml | 29 + res/layout-watch/confirmation_dialog.xml | 131 ++ res/layout-watch/permissions_settings_item.xml | 47 + res/layout-watch/settings.xml | 21 + res/layout-watch/settings_internal.xml | 37 + res/layout/app_details.xml | 8 +- res/layout/grant_permissions.xml | 46 +- res/layout/header.xml | 15 +- res/layout/install_confirm.xml | 3 +- res/layout/permission_description.xml | 6 +- res/layout/permissions_frame.xml | 4 +- res/layout/preference_permissions.xml | 2 +- res/layout/preference_permissions_switch.xml | 2 +- res/layout/uninstall_confirm.xml | 3 +- res/values-af-watch/strings.xml | 25 + res/values-af/strings.xml | 4 +- res/values-am-watch/strings.xml | 25 + res/values-am/strings.xml | 4 +- res/values-ar-watch/strings.xml | 25 + res/values-ar/strings.xml | 2 + res/values-az-rAZ-watch/strings.xml | 25 + res/values-az-rAZ/strings.xml | 2 + res/values-bg-watch/strings.xml | 25 + res/values-bg/strings.xml | 2 + res/values-bn-rBD-watch/strings.xml | 25 + res/values-bn-rBD/strings.xml | 2 + res/values-ca-watch/strings.xml | 25 + res/values-ca/strings.xml | 2 + res/values-cs-watch/strings.xml | 25 + res/values-cs/strings.xml | 2 + res/values-da-television/strings.xml | 2 +- res/values-da-watch/strings.xml | 25 + res/values-da/strings.xml | 4 +- res/values-de-television/strings.xml | 2 +- res/values-de-watch/strings.xml | 25 + res/values-de/strings.xml | 48 +- res/values-el-watch/strings.xml | 25 + res/values-el/strings.xml | 2 + res/values-en-rAU-watch/strings.xml | 25 + res/values-en-rAU/strings.xml | 2 + res/values-en-rGB-watch/strings.xml | 25 + res/values-en-rGB/strings.xml | 2 + res/values-en-rIN-watch/strings.xml | 25 + res/values-en-rIN/strings.xml | 2 + res/values-es-rUS-watch/strings.xml | 25 + res/values-es-rUS/strings.xml | 2 + res/values-es-watch/strings.xml | 25 + res/values-es/strings.xml | 2 + res/values-et-rEE-watch/strings.xml | 25 + res/values-et-rEE/strings.xml | 2 + res/values-eu-rES-watch/strings.xml | 25 + res/values-eu-rES/strings.xml | 2 + res/values-fa-watch/strings.xml | 25 + res/values-fa/strings.xml | 2 + res/values-fi-watch/strings.xml | 25 + res/values-fi/strings.xml | 2 + res/values-fr-rCA-watch/strings.xml | 25 + res/values-fr-rCA/strings.xml | 4 +- res/values-fr-watch/strings.xml | 25 + res/values-fr/strings.xml | 2 + res/values-gl-rES-watch/strings.xml | 25 + res/values-gl-rES/strings.xml | 2 + res/values-gu-rIN-watch/strings.xml | 25 + res/values-gu-rIN/strings.xml | 2 + res/values-hi-watch/strings.xml | 25 + res/values-hi/strings.xml | 2 + res/values-hr-watch/strings.xml | 25 + res/values-hr/strings.xml | 2 + res/values-hu-watch/strings.xml | 25 + res/values-hu/strings.xml | 2 + res/values-hy-rAM-watch/strings.xml | 25 + res/values-hy-rAM/strings.xml | 2 + res/values-in-watch/strings.xml | 25 + res/values-in/strings.xml | 2 + res/values-is-rIS-watch/strings.xml | 25 + res/values-is-rIS/strings.xml | 2 + res/values-it-watch/strings.xml | 25 + res/values-it/strings.xml | 2 + res/values-iw-watch/strings.xml | 25 + res/values-iw/strings.xml | 2 + res/values-ja-watch/strings.xml | 25 + res/values-ja/strings.xml | 2 + res/values-ka-rGE-watch/strings.xml | 25 + res/values-ka-rGE/strings.xml | 2 + res/values-kk-rKZ-watch/strings.xml | 25 + res/values-kk-rKZ/strings.xml | 2 + res/values-km-rKH-watch/strings.xml | 25 + res/values-km-rKH/strings.xml | 2 + res/values-kn-rIN-watch/strings.xml | 25 + res/values-kn-rIN/strings.xml | 2 + res/values-ko-watch/strings.xml | 25 + res/values-ko/strings.xml | 4 +- res/values-ky-rKG-watch/strings.xml | 25 + res/values-ky-rKG/strings.xml | 2 + res/values-lo-rLA-watch/strings.xml | 25 + res/values-lo-rLA/strings.xml | 2 + res/values-lt-watch/strings.xml | 25 + res/values-lt/strings.xml | 2 + res/values-lv-watch/strings.xml | 25 + res/values-lv/strings.xml | 2 + res/values-mk-rMK-watch/strings.xml | 25 + res/values-mk-rMK/strings.xml | 4 +- res/values-ml-rIN-watch/strings.xml | 25 + res/values-ml-rIN/strings.xml | 2 + res/values-mn-rMN-watch/strings.xml | 25 + res/values-mn-rMN/strings.xml | 2 + res/values-mr-rIN-watch/strings.xml | 25 + res/values-mr-rIN/strings.xml | 2 + res/values-ms-rMY-watch/strings.xml | 25 + res/values-ms-rMY/strings.xml | 2 + res/values-my-rMM-watch/strings.xml | 25 + res/values-my-rMM/strings.xml | 2 + res/values-nb-watch/strings.xml | 25 + res/values-nb/strings.xml | 2 + res/values-ne-rNP-watch/strings.xml | 25 + res/values-ne-rNP/strings.xml | 8 +- res/values-nl-watch/strings.xml | 25 + res/values-nl/strings.xml | 8 +- res/values-pa-rIN-watch/strings.xml | 25 + res/values-pa-rIN/strings.xml | 2 + res/values-pl-watch/strings.xml | 25 + res/values-pl/strings.xml | 4 +- res/values-pt-rBR-watch/strings.xml | 25 + res/values-pt-rBR/strings.xml | 4 +- res/values-pt-rPT-watch/strings.xml | 25 + res/values-pt-rPT/strings.xml | 2 + res/values-pt-watch/strings.xml | 25 + res/values-pt/strings.xml | 4 +- res/values-ro-watch/strings.xml | 25 + res/values-ro/strings.xml | 4 +- res/values-round/dimens.xml | 26 + res/values-ru-watch/strings.xml | 25 + res/values-ru/strings.xml | 4 +- res/values-si-rLK-watch/strings.xml | 25 + res/values-si-rLK/strings.xml | 2 + res/values-sk-watch/strings.xml | 25 + res/values-sk/strings.xml | 2 + res/values-sl-watch/strings.xml | 25 + res/values-sl/strings.xml | 2 + res/values-sq-rAL-watch/strings.xml | 25 + res/values-sq-rAL/strings.xml | 2 + res/values-sr-watch/strings.xml | 25 + res/values-sr/strings.xml | 2 + res/values-sv-watch/strings.xml | 25 + res/values-sv/strings.xml | 8 +- res/values-sw-watch/strings.xml | 25 + res/values-sw/strings.xml | 2 + res/values-ta-rIN-watch/strings.xml | 25 + res/values-ta-rIN/strings.xml | 4 +- res/values-te-rIN-watch/strings.xml | 25 + res/values-te-rIN/strings.xml | 2 + res/values-television/colors.xml | 7 + res/values-television/styles.xml | 37 + res/values-th-watch/strings.xml | 25 + res/values-th/strings.xml | 2 + res/values-tl-watch/strings.xml | 25 + res/values-tl/strings.xml | 2 + res/values-tr-watch/strings.xml | 25 + res/values-tr/strings.xml | 2 + res/values-uk-watch/strings.xml | 25 + res/values-uk/strings.xml | 2 + res/values-ur-rPK-watch/strings.xml | 25 + res/values-ur-rPK/strings.xml | 2 + res/values-uz-rUZ-watch/strings.xml | 25 + res/values-uz-rUZ/strings.xml | 2 + res/values-vi-watch/strings.xml | 25 + res/values-vi/strings.xml | 2 + res/values-watch/attrs.xml | 35 + res/values-watch/colors.xml | 36 + res/values-watch/dimens.xml | 57 + .../integers.xml} | 11 +- res/values-watch/strings.xml | 37 + res/values-watch/styles.xml | 49 + res/values-watch/themes.xml | 64 + res/values-zh-rCN-watch/strings.xml | 25 + res/values-zh-rCN/strings.xml | 4 +- res/values-zh-rHK-watch/strings.xml | 25 + res/values-zh-rHK/strings.xml | 2 + res/values-zh-rTW-watch/strings.xml | 25 + res/values-zh-rTW/strings.xml | 2 + res/values-zu-watch/strings.xml | 25 + res/values-zu/strings.xml | 2 + res/values/colors.xml | 31 - res/values/strings.xml | 5 + res/values/styles.xml | 31 +- res/values/themes.xml | 10 +- .../support/wearable/view/CircledImageView.java | 603 +++++++++ .../support/wearable/view/Gusterpolator.java | 84 ++ .../support/wearable/view/ProgressDrawable.java | 176 +++ .../wearable/view/SimpleAnimatorListener.java | 67 + .../support/wearable/view/WearableListView.java | 1387 ++++++++++++++++++++ src/com/android/packageinstaller/DeviceUtils.java | 32 + .../packageinstaller/InstallFlowAnalytics.java | 7 +- .../packageinstaller/PackageInstallerActivity.java | 22 +- .../permission/model/AppPermissions.java | 9 +- .../permission/model/PermissionApps.java | 3 +- .../permission/model/PermissionGroups.java | 5 +- .../permission/model/PermissionStatusReceiver.java | 107 +- .../permission/ui/ButtonBarLayout.java | 117 ++ .../permission/ui/GrantPermissionsActivity.java | 17 +- .../permission/ui/GrantPermissionsViewHandler.java | 2 +- .../ui/GrantPermissionsWatchViewHandler.java | 176 +++ .../permission/ui/ManagePermissionsActivity.java | 29 +- .../permission/ui/OverlayTouchActivity.java | 3 +- .../permission/ui/OverlayWarningDialog.java | 1 + .../permission/ui/PreferenceImageView.java | 69 + .../permission/ui/SecureButtonView.java | 56 - .../ui/handheld/AllAppPermissionsFragment.java | 214 +++ .../ui/handheld/AppPermissionsFragment.java | 404 ++++++ .../GrantPermissionsViewHandlerImpl.java} | 16 +- .../ui/handheld/ManagePermissionsFragment.java | 268 ++++ .../ui/handheld/PermissionAppsFragment.java | 428 ++++++ .../ui/handheld/PermissionsFrameFragment.java | 121 ++ .../ui/{ => handheld}/SettingsWithHeader.java | 6 +- .../AllAppPermissionsFragment.java | 2 +- .../{ => television}/AppPermissionsFragment.java | 3 +- .../GrantPermissionsViewHandlerImpl.java} | 9 +- .../ManagePermissionsFragment.java | 4 +- .../{ => television}/PermissionAppsFragment.java | 6 +- .../{ => television}/PermissionsFrameFragment.java | 21 +- .../ui/television/SettingsWithHeader.java | 86 ++ .../ui/wear/AppPermissionsFragmentWear.java | 335 +++++ .../ui/wear/ConfirmationViewHandler.java | 381 ++++++ .../permission/ui/wear/TitledSettingsFragment.java | 234 ++++ .../ui/wear/WarningConfirmationActivity.java | 118 ++ .../ExtendedOnCenterProximityListener.java | 30 + .../ui/wear/settings/ExtendedViewHolder.java | 84 ++ .../wear/settings/PermissionsSettingsAdapter.java | 101 ++ .../ui/wear/settings/SettingsAdapter.java | 276 ++++ .../permission/ui/wear/settings/ViewUtils.java | 48 + .../permission/utils/LocationUtils.java | 17 +- .../packageinstaller/permission/utils/Utils.java | 21 +- .../packageinstaller/wear/WearPackageArgs.java | 92 ++ .../wear/WearPackageIconProvider.java | 202 +++ .../wear/WearPackageInstallerService.java | 602 +++++++++ .../packageinstaller/wear/WearPackageUtil.java | 167 +++ 341 files changed, 10154 insertions(+), 294 deletions(-) fd5047e [DO NOT MERGE] Bring back overlay warning in permissions UI. 67af698 DO NOT MERGE Take advantage of new MotionEvent flag to prevent tapjacking. 4e5cd3a Import translations. DO NOT MERGE 0271c5d Import translations. DO NOT MERGE 08f085b Import translations. DO NOT MERGE 929b6de Import translations. DO NOT MERGE 58045ad Always have an icon f62bc1f Import translations. DO NOT MERGE b3d46ff [PkgInstaller] Refactoring arguments of WearPackageInstaller 42af15b Fix some UI glitches in PackageInstaller cfc6b97 Fix wake lock leak 741ac03 Fix build break. 0937012 Fix build ef86137 resolve merge conflicts of c10abb25f3 to cw-e-dev. 2cf17dd Clean up package installer styling 9c78316 Remove app from "needs permission" state if installation failed 012a557 resolve merge conflicts of e8c6801367 to cw-e-dev. 914243a Button bar animating when it isn't supposed to e18bfc2 Fix out of bounds exception c70bf71 Make GrantPermissions dialog not swipable on Watch e4cd4f8 Add mechanism for determining if apps are system apps 6d21bd7 Import translations. DO NOT MERGE 851c6ea Fix Permissions Dialog animations 53fff03 Import translations. DO NOT MERGE 234675e Import translations. DO NOT MERGE 51f646b Reduce the top padding when message isn't at top. dc40bd7 Add top padding to grant permission content. 1ba9d11 MNC Perms: Missed some cases for package installation 0e3c7db Modifies wear Permission title height to avoid clipping 6a57628 Permissions redline fixes eb9a1b6 Block Install Intent for Wear devices 0d0e466 Fix CTS test by renaming button ids to match 0c49c07 Add enabled/disabled icons for permissions on Wear 4b74275 Add new dialog for warning confirmations 639283b MNC Perms: Button bar animate to max half window height 6161f39 Update Grant Permissions dialog to redlines 38e80af Fix "needs permissions" items icons 736c82b Permissions Settings UI updates 1a61dfd Add string for Wear version of permission "enforced by policy" eaa6612 Fix build break 982f4b0 Fix build break df4d454 Build initial Permissions Settings UI page for Wear 6412dc4 Permissions Watch settings UI port 03dc824 Changing layout to make button animations work 94df7bf Add an API for getting list of all apps that have runtime perms 46fed54 Redo Move ClockworkPackageInstaller functionality here" 5b26c2e Revert "Move ClockworkPackageInstaller functionality here" aa4368c Move ClockworkPackageInstaller functionality here 9478120 Implement base version of GrantPermissions dialog 70d651e Revert "Implement base version of GrantPermissions dialog" b7da1f5 Implement base version of GrantPermissions dialog ========platform/packages/apps/Settings between android-6.0.1_r46..android-6.0.1_r54========= res/values-af/strings.xml | 7 + res/values-am/strings.xml | 4 + res/values-ar/strings.xml | 4 + res/values-az-rAZ/strings.xml | 4 + res/values-bg/strings.xml | 4 + res/values-bn-rBD/strings.xml | 4 + res/values-ca/strings.xml | 8 +- res/values-cs/strings.xml | 15 +- res/values-da/strings.xml | 8 +- res/values-de/strings.xml | 459 +++++++++++---------- res/values-el/strings.xml | 4 + res/values-en-rAU/strings.xml | 7 + res/values-en-rGB/strings.xml | 7 + res/values-en-rIN/strings.xml | 7 + res/values-es-rUS/strings.xml | 7 + res/values-es/strings.xml | 6 +- res/values-et-rEE/strings.xml | 4 + res/values-eu-rES/strings.xml | 10 +- res/values-fa/strings.xml | 34 +- res/values-fi/strings.xml | 9 +- res/values-fr-rCA/strings.xml | 7 + res/values-fr/strings.xml | 21 +- res/values-gl-rES/strings.xml | 11 +- res/values-gu-rIN/strings.xml | 4 + res/values-hi/strings.xml | 4 + res/values-hr/strings.xml | 9 +- res/values-hu/strings.xml | 60 +-- res/values-hy-rAM/strings.xml | 11 +- res/values-in/strings.xml | 4 + res/values-is-rIS/strings.xml | 7 + res/values-it/strings.xml | 8 +- res/values-iw/strings.xml | 9 +- res/values-ja/strings.xml | 31 +- res/values-ka-rGE/strings.xml | 7 + res/values-kk-rKZ/strings.xml | 7 + res/values-km-rKH/strings.xml | 4 + res/values-kn-rIN/strings.xml | 7 + res/values-ko/strings.xml | 4 + res/values-ky-rKG/strings.xml | 7 + res/values-lo-rLA/strings.xml | 9 +- res/values-lt/strings.xml | 4 + res/values-lv/strings.xml | 7 + res/values-mk-rMK/strings.xml | 102 ++--- res/values-ml-rIN/strings.xml | 4 + res/values-mn-rMN/strings.xml | 4 + res/values-mr-rIN/strings.xml | 9 +- res/values-ms-rMY/strings.xml | 7 + res/values-my-rMM/strings.xml | 4 + res/values-nb/strings.xml | 13 +- res/values-ne-rNP/strings.xml | 8 +- res/values-nl/strings.xml | 6 +- res/values-pa-rIN/strings.xml | 4 + res/values-pl/strings.xml | 9 +- res/values-pt-rBR/strings.xml | 7 + res/values-pt-rPT/strings.xml | 7 + res/values-pt/strings.xml | 7 + res/values-ro/strings.xml | 105 ++--- res/values-ru/strings.xml | 11 +- res/values-si-rLK/strings.xml | 4 + res/values-sk/strings.xml | 4 + res/values-sl/strings.xml | 7 + res/values-sq-rAL/arrays.xml | 48 +-- res/values-sq-rAL/strings.xml | 4 + res/values-sr/strings.xml | 7 + res/values-sv/strings.xml | 4 + res/values-sw/strings.xml | 4 + res/values-ta-rIN/strings.xml | 13 +- res/values-te-rIN/strings.xml | 4 + res/values-th/strings.xml | 17 +- res/values-tl/strings.xml | 7 + res/values-tr/strings.xml | 7 + res/values-uk/strings.xml | 4 + res/values-ur-rPK/strings.xml | 7 + res/values-uz-rUZ/strings.xml | 99 ++--- res/values-vi/strings.xml | 4 + res/values-zh-rCN/strings.xml | 95 +++-- res/values-zh-rHK/strings.xml | 8 +- res/values-zh-rTW/strings.xml | 12 +- res/values-zu/strings.xml | 4 + res/values/config.xml | 3 + res/values/dimens.xml | 2 - res/values/strings.xml | 18 + res/xml/development_prefs.xml | 6 + src/com/android/settings/DataUsageSummary.java | 80 +--- src/com/android/settings/DevelopmentSettings.java | 31 ++ src/com/android/settings/ResetNetworkConfirm.java | 3 + src/com/android/settings/UserAdapter.java | 4 +- src/com/android/settings/Utils.java | 71 +--- src/com/android/settings/WifiCallingSettings.java | 13 + src/com/android/settings/WirelessSettings.java | 2 +- .../settings/applications/InstalledAppDetails.java | 8 +- .../settings/applications/RunningState.java | 2 +- .../settings/drawable/CircleFramedDrawable.java | 136 ------ .../android/settings/fuelgauge/BatteryEntry.java | 2 +- src/com/android/settings/net/ChartData.java | 27 -- src/com/android/settings/net/ChartDataLoader.java | 145 ------- .../settings/net/DataUsageMeteredSettings.java | 1 + .../android/settings/net/NetworkPolicyEditor.java | 252 ----------- .../settings/net/SummaryForAllUidLoader.java | 79 ---- src/com/android/settings/net/UidDetail.java | 27 -- .../android/settings/net/UidDetailProvider.java | 194 --------- .../settings/users/EditUserInfoController.java | 4 +- .../settings/users/EditUserPhotoController.java | 4 +- .../settings/users/RestrictedProfileSettings.java | 2 +- src/com/android/settings/users/UserSettings.java | 2 +- 105 files changed, 1076 insertions(+), 1566 deletions(-) 9738c9f Import translations. DO NOT MERGE 2334d35 Added toast message to color temperature setting c123a6a Import translations. DO NOT MERGE ab5da2d Enable color temperature developer setting 63e4096 Add strings for color temperature developer option 6a52aca Import translations. DO NOT MERGE 577add8 Select or not Wi-Fi Calling preference as CarrierConfig 119d589 DO NOT MERGE Modify system settings: incorrect UI state 1cb1ad2 Import translations. DO NOT MERGE 7bafd5e Revert "Import translations. DO NOT MERGE" df57be8 Import translations. DO NOT MERGE 623852f Add IMS settings to Network setting reset 2102350 Import translations. DO NOT MERGE 14bf226 [DO NOT MERGE] Preserve FRP lock if wiped during SUW de4fc8e Preserve FRP lock if wiped during SUW 98f11fd Uncheck checkbox for contact sharing by default for non carkit devices. dbc47fb Uncheck checkbox for contact sharing by default for non carkit devices. 4836ab6 Block developer settings during SUW a4c9492 Null check queryIntentServices b6c7b05 Further tweak to issue #issue #25371736: Don't include z-ram allocations in Android OS 30bbd90 Fix issue #25371736: Don't include z-ram allocations in Android OS 6e58d51 Refactor UidDetailProvider and its dependencies to SettingsLib. 8dffd15 Move SummaryForAllUidLoader to SettingsLib. de557d4 Move AppItem, ChartData, ChartDataLoader from Settings to SettingsLib. e0021c4 Move NetworkPolicyEditor from Settings packge to settingslib. ========platform/packages/apps/SpeechRecorder between android-6.0.1_r46..android-6.0.1_r54========= d97c587 Remove SpeechRecorder from clockwork eng builds. ========platform/packages/apps/TvSettings between android-6.0.1_r46..android-6.0.1_r54========= Settings/res/values-af/strings.xml | 71 +-- Settings/res/values-am/strings.xml | 71 +-- Settings/res/values-ar/strings.xml | 71 +-- Settings/res/values-az-rAZ/arrays.xml | 72 --- Settings/res/values-az-rAZ/strings.xml | 602 -------------------------- Settings/res/values-az-rAZ/widget-strings.xml | 26 -- Settings/res/values-bg/strings.xml | 75 +--- Settings/res/values-bn-rBD/strings.xml | 103 +---- Settings/res/values-ca/strings.xml | 89 +--- Settings/res/values-cs/strings.xml | 75 +--- Settings/res/values-da/strings.xml | 79 +--- Settings/res/values-de/strings.xml | 75 +--- Settings/res/values-el/strings.xml | 71 +-- Settings/res/values-en-rAU/strings.xml | 71 +-- Settings/res/values-en-rGB/strings.xml | 71 +-- Settings/res/values-en-rIN/strings.xml | 71 +-- Settings/res/values-es-rUS/strings.xml | 71 +-- Settings/res/values-es/strings.xml | 71 +-- Settings/res/values-et-rEE/strings.xml | 71 +-- Settings/res/values-eu-rES/strings.xml | 71 +-- Settings/res/values-fa/strings.xml | 91 +--- Settings/res/values-fi/strings.xml | 103 +---- Settings/res/values-fr-rCA/strings.xml | 71 +-- Settings/res/values-fr/strings.xml | 75 +--- Settings/res/values-gl-rES/strings.xml | 71 +-- Settings/res/values-gu-rIN/strings.xml | 137 +----- Settings/res/values-hi/strings.xml | 71 +-- Settings/res/values-hr/strings.xml | 85 +--- Settings/res/values-hu/strings.xml | 71 +-- Settings/res/values-hy-rAM/strings.xml | 71 +-- Settings/res/values-in/strings.xml | 73 +--- Settings/res/values-is-rIS/strings.xml | 71 +-- Settings/res/values-it/strings.xml | 73 +--- Settings/res/values-iw/strings.xml | 79 +--- Settings/res/values-ja/strings.xml | 85 +--- Settings/res/values-ka-rGE/strings.xml | 71 +-- Settings/res/values-kk-rKZ/strings.xml | 71 +-- Settings/res/values-km-rKH/strings.xml | 71 +-- Settings/res/values-kn-rIN/strings.xml | 121 ++---- Settings/res/values-ko/arrays.xml | 6 +- Settings/res/values-ko/strings.xml | 73 +--- Settings/res/values-ky-rKG/strings.xml | 71 +-- Settings/res/values-lo-rLA/strings.xml | 71 +-- Settings/res/values-lt/strings.xml | 71 +-- Settings/res/values-lv/strings.xml | 73 +--- Settings/res/values-mk-rMK/strings.xml | 71 +-- Settings/res/values-ml-rIN/arrays.xml | 2 +- Settings/res/values-ml-rIN/strings.xml | 135 ++---- Settings/res/values-mn-rMN/strings.xml | 71 +-- Settings/res/values-mr-rIN/strings.xml | 75 +--- Settings/res/values-ms-rMY/strings.xml | 73 +--- Settings/res/values-my-rMM/strings.xml | 71 +-- Settings/res/values-nb/strings.xml | 121 ++---- Settings/res/values-ne-rNP/strings.xml | 85 +--- Settings/res/values-nl/strings.xml | 147 ++----- Settings/res/values-pa-rIN/strings.xml | 137 +----- Settings/res/values-pl/strings.xml | 77 +--- Settings/res/values-pt-rBR/arrays.xml | 72 --- Settings/res/values-pt-rBR/strings.xml | 602 -------------------------- Settings/res/values-pt-rBR/widget-strings.xml | 26 -- Settings/res/values-pt-rPT/strings.xml | 71 +-- Settings/res/values-pt/arrays.xml | 2 +- Settings/res/values-pt/strings.xml | 73 +--- Settings/res/values-ro/strings.xml | 73 +--- Settings/res/values-ru/strings.xml | 75 +--- Settings/res/values-si-rLK/strings.xml | 71 +-- Settings/res/values-sk/strings.xml | 85 +--- Settings/res/values-sl/strings.xml | 77 +--- Settings/res/values-sq-rAL/strings.xml | 143 +----- Settings/res/values-sr/strings.xml | 73 +--- Settings/res/values-sv/strings.xml | 71 +-- Settings/res/values-sw/strings.xml | 75 +--- Settings/res/values-ta-rIN/strings.xml | 73 +--- Settings/res/values-te-rIN/strings.xml | 73 +--- Settings/res/values-th/strings.xml | 75 +--- Settings/res/values-tl/strings.xml | 71 +-- Settings/res/values-tr/strings.xml | 73 +--- Settings/res/values-uk/strings.xml | 73 +--- Settings/res/values-ur-rPK/strings.xml | 73 +--- Settings/res/values-uz-rUZ/strings.xml | 155 ++----- Settings/res/values-vi/strings.xml | 73 +--- Settings/res/values-zh-rCN/strings.xml | 75 +--- Settings/res/values-zh-rHK/strings.xml | 71 +-- Settings/res/values-zh-rTW/strings.xml | 73 +--- Settings/res/values-zu/strings.xml | 71 +-- 85 files changed, 528 insertions(+), 7058 deletions(-) 118159c Import translations. DO NOT MERGE ========platform/packages/apps/UnifiedEmail between android-6.0.1_r46..android-6.0.1_r54========= res/values-af/strings.xml | 2 +- res/values-az-rAZ-sw600dp/strings.xml | 25 -- res/values-az-rAZ/strings.xml | 484 ---------------------------------- res/values-ca/strings.xml | 4 +- res/values-cs/strings.xml | 2 +- res/values-eu-rES/strings.xml | 4 +- res/values-fa/strings.xml | 6 +- res/values-hy-rAM/strings.xml | 4 +- res/values-ja/strings.xml | 12 +- res/values-kn-rIN/strings.xml | 4 +- res/values-lt/strings.xml | 2 +- res/values-ml-rIN/strings.xml | 4 +- res/values-nb/strings.xml | 4 +- res/values-pl/strings.xml | 6 +- res/values-ro/strings.xml | 6 +- res/values-sk/strings.xml | 2 +- res/values-sr/strings.xml | 8 +- res/values-ur-rPK-sw600dp/strings.xml | 4 +- res/values-ur-rPK/strings.xml | 16 +- res/values-zh-rCN/strings.xml | 2 +- 20 files changed, 46 insertions(+), 555 deletions(-) 96e938f Don't allow cachedFile Attachments if the content Uri is pointing to EmailProvider. c4614f6 Don't allow file attachment from file:///data. ========platform/packages/inputmethods/LatinIME between android-6.0.1_r46..android-6.0.1_r54========= java/res/values-af/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-af/strings-talkback-descriptions.xml | 8 +- java/res/values-am/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-am/strings-talkback-descriptions.xml | 8 +- java/res/values-ar/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-ar/strings-talkback-descriptions.xml | 8 +- .../values-az-rAZ/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-bg/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-bg/strings-talkback-descriptions.xml | 8 +- java/res/values-bg/strings.xml | 2 +- .../values-bn-rBD/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-bn-rBD/strings.xml | 8 +- java/res/values-ca/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-ca/strings-talkback-descriptions.xml | 8 +- java/res/values-ca/strings.xml | 10 +- java/res/values-cs/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-cs/strings-talkback-descriptions.xml | 8 +- java/res/values-cs/strings.xml | 6 +- java/res/values-da/strings-emoji-descriptions.xml | 918 +++++++++++++++++++- .../values-da/strings-talkback-descriptions.xml | 8 +- java/res/values-da/strings.xml | 2 +- java/res/values-de/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-de/strings-talkback-descriptions.xml | 8 +- java/res/values-el/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-el/strings-talkback-descriptions.xml | 8 +- java/res/values-el/strings.xml | 14 +- java/res/values-en-rAU/strings-action-keys.xml | 31 - java/res/values-en-rAU/strings-appname.xml | 27 - .../strings-config-important-notice.xml | 24 - .../values-en-rAU/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-en-rAU/strings-letter-descriptions.xml | 208 ----- .../strings-talkback-descriptions.xml | 8 +- .../values-en-rGB/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- .../values-en-rIN/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- .../values-es-rUS/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-es/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-es/strings-talkback-descriptions.xml | 8 +- java/res/values-es/strings.xml | 2 +- .../values-et-rEE/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- .../values-eu-rES/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-fa/strings-emoji-descriptions.xml | 920 ++++++++++++++++++++- .../values-fa/strings-talkback-descriptions.xml | 8 +- java/res/values-fa/strings.xml | 18 +- java/res/values-fi/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-fi/strings-talkback-descriptions.xml | 8 +- java/res/values-fi/strings.xml | 4 +- .../values-fr-rCA/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-fr/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-fr/strings-talkback-descriptions.xml | 8 +- java/res/values-fr/strings.xml | 30 +- .../values-gl-rES/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-gu-rIN/strings-action-keys.xml | 31 - java/res/values-gu-rIN/strings-appname.xml | 27 - .../strings-config-important-notice.xml | 24 - .../values-gu-rIN/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-gu-rIN/strings-letter-descriptions.xml | 208 ----- .../strings-talkback-descriptions.xml | 8 +- java/res/values-gu-rIN/strings.xml | 212 ----- java/res/values-hi/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-hi/strings-talkback-descriptions.xml | 8 +- java/res/values-hi/strings.xml | 24 +- java/res/values-hr/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-hr/strings-talkback-descriptions.xml | 8 +- java/res/values-hr/strings.xml | 4 +- java/res/values-hu/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-hu/strings-talkback-descriptions.xml | 8 +- .../values-hy-rAM/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-in/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-in/strings-talkback-descriptions.xml | 8 +- .../values-is-rIS/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-it/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-it/strings-talkback-descriptions.xml | 8 +- java/res/values-it/strings.xml | 8 +- java/res/values-iw/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-iw/strings-talkback-descriptions.xml | 8 +- java/res/values-iw/strings.xml | 14 +- .../values-ja/strings-config-important-notice.xml | 2 +- java/res/values-ja/strings-emoji-descriptions.xml | 920 ++++++++++++++++++++- .../values-ja/strings-talkback-descriptions.xml | 8 +- java/res/values-ja/strings.xml | 4 +- .../values-ka-rGE/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- .../values-kk-rKZ/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- .../values-km-rKH/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- .../values-kn-rIN/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-kn-rIN/strings.xml | 13 +- java/res/values-ko/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-ko/strings-talkback-descriptions.xml | 8 +- .../values-ky-rKG/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- .../values-lo-rLA/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-lo-rLA/strings-letter-descriptions.xml | 2 +- .../strings-talkback-descriptions.xml | 8 +- java/res/values-lt/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-lt/strings-talkback-descriptions.xml | 8 +- java/res/values-lt/strings.xml | 2 +- java/res/values-lv/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-lv/strings-talkback-descriptions.xml | 8 +- java/res/values-lv/strings.xml | 12 +- .../values-mk-rMK/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-ml-rIN/strings-appname.xml | 2 +- .../values-ml-rIN/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-ml-rIN/strings.xml | 20 +- .../values-mn-rMN/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- .../values-mr-rIN/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-mr-rIN/strings.xml | 2 +- .../values-ms-rMY/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-ms-rMY/strings.xml | 2 +- java/res/values-my-rMM/strings-action-keys.xml | 2 +- .../values-my-rMM/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-my-rMM/strings-letter-descriptions.xml | 62 +- .../strings-talkback-descriptions.xml | 8 +- java/res/values-nb/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-nb/strings-talkback-descriptions.xml | 8 +- java/res/values-nb/strings.xml | 12 +- .../values-ne-rNP/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-nl/strings-action-keys.xml | 2 +- .../values-nl/strings-config-important-notice.xml | 2 +- java/res/values-nl/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-nl/strings-talkback-descriptions.xml | 8 +- java/res/values-nl/strings.xml | 28 +- java/res/values-pa-rIN/strings-action-keys.xml | 31 - java/res/values-pa-rIN/strings-appname.xml | 27 - .../strings-config-important-notice.xml | 24 - .../values-pa-rIN/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-pa-rIN/strings-letter-descriptions.xml | 208 ----- .../strings-talkback-descriptions.xml | 8 +- java/res/values-pa-rIN/strings.xml | 212 ----- .../values-pl/strings-config-important-notice.xml | 2 +- java/res/values-pl/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-pl/strings-talkback-descriptions.xml | 10 +- java/res/values-pl/strings.xml | 4 +- .../values-pt-rPT/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-pt/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-pt/strings-talkback-descriptions.xml | 8 +- java/res/values-ro/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-ro/strings-talkback-descriptions.xml | 8 +- java/res/values-ro/strings.xml | 16 +- java/res/values-ru/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-ru/strings-talkback-descriptions.xml | 8 +- java/res/values-ru/strings.xml | 8 +- .../values-si-rLK/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-sk/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-sk/strings-talkback-descriptions.xml | 8 +- java/res/values-sk/strings.xml | 12 +- java/res/values-sl/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-sl/strings-talkback-descriptions.xml | 8 +- java/res/values-sl/strings.xml | 2 +- java/res/values-sq-rAL/strings-action-keys.xml | 31 - java/res/values-sq-rAL/strings-appname.xml | 27 - .../strings-config-important-notice.xml | 24 - .../values-sq-rAL/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-sq-rAL/strings-letter-descriptions.xml | 208 ----- .../strings-talkback-descriptions.xml | 8 +- java/res/values-sq-rAL/strings.xml | 212 ----- java/res/values-sr/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-sr/strings-talkback-descriptions.xml | 8 +- java/res/values-sr/strings.xml | 8 +- java/res/values-sv/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-sv/strings-talkback-descriptions.xml | 8 +- java/res/values-sv/strings.xml | 4 +- java/res/values-sw/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-sw/strings-talkback-descriptions.xml | 8 +- .../values-ta-rIN/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- .../values-te-rIN/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-te-rIN/strings.xml | 8 +- java/res/values-th/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-th/strings-talkback-descriptions.xml | 8 +- java/res/values-th/strings.xml | 4 +- java/res/values-tl/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-tl/strings-talkback-descriptions.xml | 8 +- java/res/values-tl/strings.xml | 42 +- java/res/values-tr/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-tr/strings-talkback-descriptions.xml | 8 +- java/res/values-uk/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-uk/strings-talkback-descriptions.xml | 8 +- java/res/values-uk/strings.xml | 2 +- java/res/values-ur-rPK/strings-appname.xml | 4 +- .../values-ur-rPK/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-ur-rPK/strings.xml | 4 +- .../values-uz-rUZ/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-uz-rUZ/strings.xml | 6 +- java/res/values-vi/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-vi/strings-talkback-descriptions.xml | 8 +- .../values-zh-rCN/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-zh-rCN/strings.xml | 6 +- .../values-zh-rHK/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- .../values-zh-rTW/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../strings-talkback-descriptions.xml | 8 +- java/res/values-zu/strings-emoji-descriptions.xml | 916 ++++++++++++++++++++ .../values-zu/strings-talkback-descriptions.xml | 8 +- 219 files changed, 71301 insertions(+), 2102 deletions(-) f6d1c5f Import translations. DO NOT MERGE fdbd6fe Import translations. DO NOT MERGE 888712e Import translations. DO NOT MERGE 6cca573 Import translations. DO NOT MERGE 006c30a Import translations. DO NOT MERGE 76218d9 Import translations. DO NOT MERGE 7674a65 Unicode 8.0 emoji additions to Google Keyboard. 4de1e22 Import translations. DO NOT MERGE e1d5012 Revert "Unicode 8.0 emoji changes to Google Keyboard." 354d009 Revert "Add description strings for Unicode 8.0 new emoji." 9cc4254 Unicode 8.0 emoji changes to Google Keyboard. 332181b Add description strings for Unicode 8.0 new emoji. ========platform/packages/providers/CalendarProvider between android-6.0.1_r46..android-6.0.1_r54========= 9b2d8e1 Work on issue #25467052: System lagged out ========platform/packages/providers/ContactsProvider between android-6.0.1_r46..android-6.0.1_r54========= res/values-az-rAZ/strings.xml | 3 +++ res/values-gu-rIN/strings.xml | 2 +- res/values-ml-rIN/strings.xml | 4 ++-- res/values-nb/strings.xml | 2 +- res/values-nl/strings.xml | 4 ++-- res/values-pt-rBR/strings.xml | 35 ----------------------------------- res/values-ro/strings.xml | 6 +++--- res/values-sr/strings.xml | 2 +- res/values-uz-rUZ/strings.xml | 2 +- 9 files changed, 14 insertions(+), 46 deletions(-) 59af846 Update directories when initializing ContactsProvider. 99ccd51 Remove extra logging with privacy info DO NOT MERGE ========platform/packages/providers/DownloadProvider between android-6.0.1_r46..android-6.0.1_r54========= res/values-af/strings.xml | 10 ++++++++-- res/values-am/strings.xml | 10 ++++++++-- res/values-ar/strings.xml | 10 ++++++++-- res/values-az-rAZ/strings.xml | 13 ++++++++++--- res/values-bg/strings.xml | 12 +++++++++--- res/values-bn-rBD/strings.xml | 10 ++++++++-- res/values-ca/strings.xml | 10 ++++++++-- res/values-cs/strings.xml | 10 ++++++++-- res/values-da/strings.xml | 10 ++++++++-- res/values-de/strings.xml | 10 ++++++++-- res/values-el/strings.xml | 18 ++++++++++++------ res/values-en-rAU/strings.xml | 10 ++++++++-- res/values-en-rGB/strings.xml | 10 ++++++++-- res/values-en-rIN/strings.xml | 10 ++++++++-- res/values-es-rUS/strings.xml | 10 ++++++++-- res/values-es/strings.xml | 10 ++++++++-- res/values-et-rEE/strings.xml | 10 ++++++++-- res/values-eu-rES/strings.xml | 10 ++++++++-- res/values-fa/strings.xml | 26 ++++++++++++++++---------- res/values-fi/strings.xml | 10 ++++++++-- res/values-fr-rCA/strings.xml | 10 ++++++++-- res/values-fr/strings.xml | 10 ++++++++-- res/values-gl-rES/strings.xml | 10 ++++++++-- res/values-gu-rIN/strings.xml | 16 +++++++++++----- res/values-hi/strings.xml | 10 ++++++++-- res/values-hr/strings.xml | 10 ++++++++-- res/values-hu/strings.xml | 10 ++++++++-- res/values-hy-rAM/strings.xml | 10 ++++++++-- res/values-in/strings.xml | 10 ++++++++-- res/values-is-rIS/strings.xml | 10 ++++++++-- res/values-it/strings.xml | 10 ++++++++-- res/values-iw/strings.xml | 10 ++++++++-- res/values-ja/strings.xml | 10 ++++++++-- res/values-ka-rGE/strings.xml | 10 ++++++++-- res/values-kk-rKZ/strings.xml | 10 ++++++++-- res/values-km-rKH/strings.xml | 10 ++++++++-- res/values-kn-rIN/strings.xml | 12 +++++++++--- res/values-ko/strings.xml | 10 ++++++++-- res/values-ky-rKG/strings.xml | 10 ++++++++-- res/values-lo-rLA/strings.xml | 10 ++++++++-- res/values-lt/strings.xml | 12 +++++++++--- res/values-lv/strings.xml | 10 ++++++++-- res/values-mk-rMK/strings.xml | 10 ++++++++-- res/values-ml-rIN/strings.xml | 16 +++++++++++----- res/values-mn-rMN/strings.xml | 10 ++++++++-- res/values-mr-rIN/strings.xml | 10 ++++++++-- res/values-ms-rMY/strings.xml | 10 ++++++++-- res/values-my-rMM/strings.xml | 10 ++++++++-- res/values-nb/strings.xml | 10 ++++++++-- res/values-ne-rNP/strings.xml | 10 ++++++++-- res/values-nl/strings.xml | 14 ++++++++++---- res/values-pa-rIN/strings.xml | 10 ++++++++-- res/values-pl/strings.xml | 10 ++++++++-- res/values-pt-rPT/strings.xml | 10 ++++++++-- res/values-pt/strings.xml | 10 ++++++++-- res/values-ro/strings.xml | 14 ++++++++++---- res/values-ru/strings.xml | 10 ++++++++-- res/values-si-rLK/strings.xml | 10 ++++++++-- res/values-sk/strings.xml | 18 ++++++++++++------ res/values-sl/strings.xml | 10 ++++++++-- res/values-sq-rAL/strings.xml | 10 ++++++++-- res/values-sr/strings.xml | 10 ++++++++-- res/values-sv/strings.xml | 10 ++++++++-- res/values-sw/strings.xml | 10 ++++++++-- res/values-ta-rIN/strings.xml | 10 ++++++++-- res/values-te-rIN/strings.xml | 10 ++++++++-- res/values-th/strings.xml | 10 ++++++++-- res/values-tl/strings.xml | 10 ++++++++-- res/values-tr/strings.xml | 10 ++++++++-- res/values-uk/strings.xml | 12 +++++++++--- res/values-ur-rPK/strings.xml | 10 ++++++++-- res/values-uz-rUZ/strings.xml | 18 ++++++++++++------ res/values-vi/strings.xml | 10 ++++++++-- res/values-zh-rCN/strings.xml | 10 ++++++++-- res/values-zh-rHK/strings.xml | 10 ++++++++-- res/values-zh-rTW/strings.xml | 10 ++++++++-- res/values-zu/strings.xml | 10 ++++++++-- ui/res/values-es-rUS/strings.xml | 2 +- ui/res/values-fa/strings.xml | 8 ++++---- ui/res/values-kk-rKZ/strings.xml | 2 +- ui/res/values-nl/strings.xml | 2 +- ui/res/values-tl/strings.xml | 4 ++-- ui/res/values-uz-rUZ/strings.xml | 6 +++--- 83 files changed, 664 insertions(+), 201 deletions(-) e74ee40 DO NOT MERGE. Use resolved path when inserting and deleting. 8ec0057 Use resolved path for both checking and opening. 616188b Revert "Use resolved path for both checking and opening." 6947a09 Revert "Use resolved path for both checking and opening." 5accb13 Use resolved path for both checking and opening. 5c08fb8 Use resolved path for both checking and opening. bdc8313 Use resolved path for both checking and opening. 8fbf120 Use resolved path for both checking and opening. 6608eb8 Use resolved path for both checking and opening. 366af2e Use resolved path for both checking and opening. ========platform/packages/providers/TelephonyProvider between android-6.0.1_r46..android-6.0.1_r54========= res/values-af/config.xml | 5 ++--- res/values-af/strings.xml | 2 +- res/values-am/config.xml | 5 ++--- res/values-am/strings.xml | 2 +- res/values-ar/config.xml | 5 ++--- res/values-ar/strings.xml | 2 +- res/values-az-rAZ/config.xml | 10 ---------- res/values-az-rAZ/strings.xml | 2 +- res/values-bg/config.xml | 5 ++--- res/values-bg/strings.xml | 2 +- res/values-bn-rBD/config.xml | 5 ++--- res/values-bn-rBD/strings.xml | 2 +- res/values-ca/config.xml | 5 ++--- res/values-ca/strings.xml | 2 +- res/values-cs/config.xml | 5 ++--- res/values-cs/strings.xml | 2 +- res/values-da/config.xml | 5 ++--- res/values-da/strings.xml | 2 +- res/values-de/config.xml | 5 ++--- res/values-de/strings.xml | 2 +- res/values-el/config.xml | 5 ++--- res/values-el/strings.xml | 2 +- res/values-en-rAU/config.xml | 5 ++--- res/values-en-rAU/strings.xml | 2 +- res/values-en-rGB/config.xml | 5 ++--- res/values-en-rGB/strings.xml | 2 +- res/values-en-rIN/config.xml | 5 ++--- res/values-en-rIN/strings.xml | 2 +- res/values-es-rUS/config.xml | 5 ++--- res/values-es-rUS/strings.xml | 2 +- res/values-es/config.xml | 5 ++--- res/values-es/strings.xml | 2 +- res/values-et-rEE/config.xml | 5 ++--- res/values-et-rEE/strings.xml | 2 +- res/values-eu-rES/config.xml | 5 ++--- res/values-eu-rES/strings.xml | 2 +- res/values-fa/config.xml | 5 ++--- res/values-fa/strings.xml | 2 +- res/values-fi/config.xml | 5 ++--- res/values-fi/strings.xml | 2 +- res/values-fr-rCA/config.xml | 5 ++--- res/values-fr-rCA/strings.xml | 2 +- res/values-fr/config.xml | 5 ++--- res/values-fr/strings.xml | 2 +- res/values-gl-rES/config.xml | 5 ++--- res/values-gl-rES/strings.xml | 2 +- res/values-gu-rIN/config.xml | 5 ++--- res/values-gu-rIN/strings.xml | 2 +- res/values-hi/config.xml | 5 ++--- res/values-hi/strings.xml | 2 +- res/values-hr/config.xml | 5 ++--- res/values-hr/strings.xml | 2 +- res/values-hu/config.xml | 5 ++--- res/values-hu/strings.xml | 2 +- res/values-hy-rAM/config.xml | 5 ++--- res/values-hy-rAM/strings.xml | 2 +- res/values-in/config.xml | 5 ++--- res/values-in/strings.xml | 2 +- res/values-is-rIS/config.xml | 5 ++--- res/values-is-rIS/strings.xml | 2 +- res/values-it/config.xml | 5 ++--- res/values-it/strings.xml | 2 +- res/values-iw/config.xml | 5 ++--- res/values-iw/strings.xml | 2 +- res/values-ja/config.xml | 5 ++--- res/values-ja/strings.xml | 2 +- res/values-ka-rGE/config.xml | 5 ++--- res/values-ka-rGE/strings.xml | 2 +- res/values-kk-rKZ/config.xml | 5 ++--- res/values-kk-rKZ/strings.xml | 2 +- res/values-km-rKH/config.xml | 5 ++--- res/values-km-rKH/strings.xml | 2 +- res/values-kn-rIN/config.xml | 5 ++--- res/values-kn-rIN/strings.xml | 2 +- res/values-ko/config.xml | 5 ++--- res/values-ko/strings.xml | 2 +- res/values-ky-rKG/config.xml | 5 ++--- res/values-ky-rKG/strings.xml | 21 --------------------- res/values-lo-rLA/config.xml | 5 ++--- res/values-lo-rLA/strings.xml | 2 +- res/values-lt/config.xml | 5 ++--- res/values-lt/strings.xml | 2 +- res/values-lv/config.xml | 5 ++--- res/values-lv/strings.xml | 2 +- res/values-mk-rMK/config.xml | 5 ++--- res/values-mk-rMK/strings.xml | 2 +- res/values-ml-rIN/config.xml | 5 ++--- res/values-ml-rIN/strings.xml | 2 +- res/values-mn-rMN/config.xml | 5 ++--- res/values-mn-rMN/strings.xml | 2 +- res/values-mr-rIN/config.xml | 5 ++--- res/values-mr-rIN/strings.xml | 2 +- res/values-ms-rMY/config.xml | 5 ++--- res/values-ms-rMY/strings.xml | 2 +- res/values-my-rMM/config.xml | 5 ++--- res/values-my-rMM/strings.xml | 2 +- res/values-nb/config.xml | 5 ++--- res/values-nb/strings.xml | 2 +- res/values-ne-rNP/config.xml | 5 ++--- res/values-ne-rNP/strings.xml | 2 +- res/values-nl/config.xml | 5 ++--- res/values-nl/strings.xml | 2 +- res/values-pa-rIN/config.xml | 5 ++--- res/values-pa-rIN/strings.xml | 2 +- res/values-pl/config.xml | 5 ++--- res/values-pl/strings.xml | 2 +- res/values-pt-rPT/config.xml | 5 ++--- res/values-pt-rPT/strings.xml | 2 +- res/values-pt/config.xml | 5 ++--- res/values-pt/strings.xml | 2 +- res/values-ro/config.xml | 5 ++--- res/values-ro/strings.xml | 4 ++-- res/values-ru/config.xml | 5 ++--- res/values-ru/strings.xml | 2 +- res/values-si-rLK/config.xml | 5 ++--- res/values-si-rLK/strings.xml | 2 +- res/values-sk/config.xml | 5 ++--- res/values-sk/strings.xml | 2 +- res/values-sl/config.xml | 5 ++--- res/values-sl/strings.xml | 2 +- res/values-sq-rAL/config.xml | 5 ++--- res/values-sq-rAL/strings.xml | 2 +- res/values-sr/config.xml | 5 ++--- res/values-sr/strings.xml | 2 +- res/values-sv/config.xml | 5 ++--- res/values-sv/strings.xml | 2 +- res/values-sw/config.xml | 5 ++--- res/values-sw/strings.xml | 2 +- res/values-ta-rIN/config.xml | 5 ++--- res/values-ta-rIN/strings.xml | 2 +- res/values-te-rIN/config.xml | 5 ++--- res/values-te-rIN/strings.xml | 2 +- res/values-th/config.xml | 5 ++--- res/values-th/strings.xml | 2 +- res/values-tl/config.xml | 5 ++--- res/values-tl/strings.xml | 2 +- res/values-tr/config.xml | 5 ++--- res/values-tr/strings.xml | 2 +- res/values-uk/config.xml | 5 ++--- res/values-uk/strings.xml | 2 +- res/values-ur-rPK/config.xml | 5 ++--- res/values-ur-rPK/strings.xml | 2 +- res/values-uz-rUZ/config.xml | 5 ++--- res/values-uz-rUZ/strings.xml | 2 +- res/values-vi/config.xml | 5 ++--- res/values-vi/strings.xml | 2 +- res/values-zh-rCN/config.xml | 5 ++--- res/values-zh-rCN/strings.xml | 2 +- res/values-zh-rHK/config.xml | 5 ++--- res/values-zh-rHK/strings.xml | 2 +- res/values-zh-rTW/config.xml | 5 ++--- res/values-zh-rTW/strings.xml | 2 +- res/values-zu/config.xml | 5 ++--- res/values-zu/strings.xml | 2 +- 154 files changed, 229 insertions(+), 336 deletions(-) cecbabc Try-catch for deletePreferredApnId() ========platform/packages/services/Telecomm between android-6.0.1_r46..android-6.0.1_r54========= AndroidManifest.xml | 3 + res/values-af/strings.xml | 2 +- res/values-am/strings.xml | 2 +- res/values-ar/strings.xml | 2 +- res/values-az-rAZ/strings.xml | 2 +- res/values-bg/strings.xml | 2 +- res/values-bn-rBD/strings.xml | 2 +- res/values-ca/strings.xml | 2 +- res/values-cs/strings.xml | 2 +- res/values-da/strings.xml | 4 +- res/values-de/strings.xml | 2 +- res/values-el/strings.xml | 2 +- res/values-en-rAU/strings.xml | 2 +- res/values-en-rGB/strings.xml | 2 +- res/values-en-rIN/strings.xml | 2 +- res/values-es-rUS/strings.xml | 2 +- res/values-es/strings.xml | 2 +- res/values-et-rEE/strings.xml | 2 +- res/values-eu-rES/strings.xml | 2 +- res/values-fa/strings.xml | 2 +- res/values-fi/strings.xml | 2 +- res/values-fr-rCA/strings.xml | 2 +- res/values-fr/strings.xml | 2 +- res/values-gl-rES/strings.xml | 2 +- res/values-gu-rIN/strings.xml | 2 +- res/values-hi/strings.xml | 2 +- res/values-hr/strings.xml | 2 +- res/values-hu/strings.xml | 2 +- res/values-hy-rAM/strings.xml | 2 +- res/values-in/strings.xml | 2 +- res/values-is-rIS/strings.xml | 2 +- res/values-it/strings.xml | 2 +- res/values-iw/strings.xml | 2 +- res/values-ja/strings.xml | 2 +- res/values-ka-rGE/strings.xml | 2 +- res/values-kk-rKZ/strings.xml | 2 +- res/values-km-rKH/strings.xml | 2 +- res/values-kn-rIN/strings.xml | 2 +- res/values-ko/strings.xml | 2 +- res/values-ky-rKG/strings.xml | 2 +- res/values-lo-rLA/strings.xml | 2 +- res/values-lt/strings.xml | 2 +- res/values-lv/strings.xml | 2 +- res/values-mk-rMK/strings.xml | 2 +- res/values-ml-rIN/strings.xml | 2 +- res/values-mn-rMN/strings.xml | 2 +- res/values-mr-rIN/strings.xml | 2 +- res/values-ms-rMY/strings.xml | 2 +- res/values-my-rMM/strings.xml | 2 +- res/values-nb/strings.xml | 2 +- res/values-ne-rNP/strings.xml | 2 +- res/values-nl/strings.xml | 2 +- res/values-pa-rIN/strings.xml | 2 +- res/values-pl/strings.xml | 2 +- res/values-pt-rPT/strings.xml | 2 +- res/values-pt/strings.xml | 2 +- res/values-ro/strings.xml | 6 +- res/values-ru/strings.xml | 2 +- res/values-si-rLK/strings.xml | 2 +- res/values-sk/strings.xml | 2 +- res/values-sl/strings.xml | 2 +- res/values-sq-rAL/strings.xml | 2 +- res/values-sr/strings.xml | 2 +- res/values-sv/strings.xml | 2 +- res/values-sw/strings.xml | 2 +- res/values-ta-rIN/strings.xml | 2 +- res/values-te-rIN/strings.xml | 2 +- res/values-th/strings.xml | 2 +- res/values-tl/strings.xml | 2 +- res/values-tr/strings.xml | 2 +- res/values-uk/strings.xml | 2 +- res/values-ur-rPK/strings.xml | 2 +- res/values-uz-rUZ/strings.xml | 2 +- res/values-vi/strings.xml | 2 +- res/values-zh-rCN/strings.xml | 4 +- res/values-zh-rHK/strings.xml | 2 +- res/values-zh-rTW/strings.xml | 2 +- res/values-zu/strings.xml | 2 +- res/values/config.xml | 7 ++ res/values/strings.xml | 2 +- .../android/server/telecom/BluetoothManager.java | 34 ++++++--- src/com/android/server/telecom/Call.java | 61 ++++++++++++++++- src/com/android/server/telecom/CallsManager.java | 33 ++++++++- .../server/telecom/CallsManagerListenerBase.java | 4 ++ .../server/telecom/ConnectionServiceWrapper.java | 37 +++++++++- .../android/server/telecom/InCallController.java | 6 +- .../android/server/telecom/InCallToneMonitor.java | 80 +++++++++++++++++++++- src/com/android/server/telecom/Log.java | 1 + .../server/telecom/PhoneAccountRegistrar.java | 34 ++++++++- .../server/telecom/RespondViaSmsManager.java | 5 +- src/com/android/server/telecom/Ringer.java | 9 +++ .../android/server/telecom/TelecomServiceImpl.java | 15 +++- src/com/android/server/telecom/Timeouts.java | 9 +++ .../server/telecom/ui/MissedCallNotifierImpl.java | 58 ++++++++++++++++ .../telecom/tests/ConnectionServiceFixture.java | 7 ++ 95 files changed, 463 insertions(+), 104 deletions(-) 8503f03 DO NOT MERGE Listen for ConnectionEvent and use the InCallToneMonitor to play the tone b5a7feb DO NOT MERGE - Restrict ability to add call based on device provision status 2750faa DO NOT MERGE Check PAH in addNewIncomingCall 818a79f Import translations. DO NOT MERGE f1c1679 DO NOT MERGE Add timer to make in-call ui reflect bluetooth state 65f3b56 Import translations. DO NOT MERGE 7f03f5e Import translations. DO NOT MERGE beb1b42 Import translations. DO NOT MERGE 0a9cfab Revert string resource to previous version. 18ceebc Fix log type used for logging silence. 0da5fa4 DO NOT MERGE ANYWHERE 6d96252 Notify connections when the ringer is silenced. 88f900a Make rerouting audio to speaker when docked configurable. 7bab665 Fix log message for phone-account unregistration. 7d53dd2 Broadcast when a phone account is unregistered. 6afefa4 Account for scheme when checking if we can handle a call. de0ac37 Disconnect calls when there is no call capable account available. a0bb705 Handle emergency only phone accounts. 5a6441d Do not ring in theater mode. ddd966e Properly route rejection reply when capability is set. 6134090 Only add callback into missed call notification with non-null handle. 41045b4 Allow a custom component to receive notification of missed call. ========platform/packages/services/Telephony between android-6.0.1_r46..android-6.0.1_r54========= AndroidManifest.xml | 1 + res/values-af/strings.xml | 1 - res/values-am/strings.xml | 1 - res/values-ar/strings.xml | 1 - res/values-az-rAZ/arrays.xml | 30 ------ res/values-az-rAZ/strings.xml | 1 - res/values-bg/strings.xml | 1 - res/values-bn-rBD/strings.xml | 1 - res/values-ca/strings.xml | 1 - res/values-cs/strings.xml | 1 - res/values-da/strings.xml | 7 +- res/values-de/strings.xml | 1 - res/values-el/strings.xml | 1 - res/values-en-rAU/strings.xml | 1 - res/values-en-rGB/strings.xml | 1 - res/values-en-rIN/strings.xml | 1 - res/values-es-rUS/strings.xml | 1 - res/values-es/strings.xml | 1 - res/values-et-rEE/strings.xml | 1 - res/values-eu-rES/strings.xml | 1 - res/values-fa/strings.xml | 3 +- res/values-fi/strings.xml | 1 - res/values-fr-rCA/strings.xml | 1 - res/values-fr/strings.xml | 1 - res/values-gl-rES/strings.xml | 1 - res/values-gu-rIN/strings.xml | 1 - res/values-hi/strings.xml | 1 - res/values-hr/strings.xml | 1 - res/values-hu/strings.xml | 17 ++-- res/values-hy-rAM/strings.xml | 1 - res/values-in/strings.xml | 1 - res/values-is-rIS/strings.xml | 1 - res/values-it/strings.xml | 1 - res/values-iw/strings.xml | 1 - res/values-ja/strings.xml | 1 - res/values-ka-rGE/strings.xml | 1 - res/values-kk-rKZ/strings.xml | 1 - res/values-km-rKH/strings.xml | 1 - res/values-kn-rIN/strings.xml | 1 - res/values-ko/strings.xml | 1 - res/values-ky-rKG/strings.xml | 1 - res/values-lo-rLA/strings.xml | 1 - res/values-lt/strings.xml | 1 - res/values-lv/strings.xml | 1 - res/values-mk-rMK/strings.xml | 13 ++- res/values-ml-rIN/strings.xml | 1 - res/values-mn-rMN/strings.xml | 1 - res/values-mr-rIN/strings.xml | 1 - res/values-ms-rMY/strings.xml | 1 - res/values-my-rMM/strings.xml | 1 - res/values-nb/strings.xml | 1 - res/values-ne-rNP/strings.xml | 1 - res/values-nl/strings.xml | 3 +- res/values-pa-rIN/strings.xml | 1 - res/values-pl/strings.xml | 1 - res/values-pt-rPT/strings.xml | 1 - res/values-pt/strings.xml | 1 - res/values-ro/strings.xml | 101 ++++++++++----------- res/values-ru/strings.xml | 1 - res/values-si-rLK/strings.xml | 1 - res/values-sk/strings.xml | 1 - res/values-sl/strings.xml | 1 - res/values-sq-rAL/strings.xml | 1 - res/values-sr/strings.xml | 1 - res/values-sv/strings.xml | 1 - res/values-sw/strings.xml | 1 - res/values-ta-rIN/strings.xml | 1 - res/values-te-rIN/strings.xml | 1 - res/values-th/strings.xml | 1 - res/values-tl/strings.xml | 1 - res/values-tr/strings.xml | 1 - res/values-uk/strings.xml | 1 - res/values-ur-rPK/strings.xml | 1 - res/values-uz-rUZ/strings.xml | 17 ++-- res/values-vi/strings.xml | 1 - res/values-zh-rCN/strings.xml | 19 ++-- res/values-zh-rHK/strings.xml | 1 - res/values-zh-rTW/strings.xml | 1 - res/values-zu/strings.xml | 1 - res/values/config.xml | 27 ++++++ res/values/strings.xml | 3 - sip/res/values-az-rAZ/strings.xml | 77 ---------------- sip/res/values-bg/strings.xml | 4 +- sip/res/values-ca/strings.xml | 6 +- sip/res/values-cs/strings.xml | 8 +- sip/res/values-da/strings.xml | 4 +- sip/res/values-de/strings.xml | 2 +- sip/res/values-es/strings.xml | 8 +- sip/res/values-fa/strings.xml | 4 +- sip/res/values-fr/strings.xml | 2 +- sip/res/values-gu-rIN/strings.xml | 2 +- sip/res/values-hr/strings.xml | 4 +- sip/res/values-in/strings.xml | 2 +- sip/res/values-ja/strings.xml | 4 +- sip/res/values-kk-rKZ/strings.xml | 4 +- sip/res/values-kn-rIN/strings.xml | 2 +- sip/res/values-ko/strings.xml | 4 +- sip/res/values-lt/strings.xml | 4 +- sip/res/values-lv/strings.xml | 6 +- sip/res/values-ml-rIN/strings.xml | 16 ++-- sip/res/values-mr-rIN/strings.xml | 4 +- sip/res/values-ms-rMY/strings.xml | 2 +- sip/res/values-nb/strings.xml | 22 ++--- sip/res/values-nl/strings.xml | 4 +- sip/res/values-pl/strings.xml | 10 +- sip/res/values-ro/strings.xml | 2 +- sip/res/values-sk/strings.xml | 18 ++-- sip/res/values-sl/strings.xml | 2 +- sip/res/values-sq-rAL/strings.xml | 16 ++-- sip/res/values-ta-rIN/strings.xml | 2 +- sip/res/values-tl/strings.xml | 18 ++-- sip/res/values-uk/strings.xml | 12 +-- sip/res/values-ur-rPK/strings.xml | 4 +- sip/res/values-uz-rUZ/strings.xml | 32 +++---- sip/res/values-vi/strings.xml | 8 +- sip/res/values-zh-rCN/strings.xml | 4 +- src/com/android/phone/BluetoothManager.java | 61 ------------- src/com/android/phone/CallNotifier.java | 17 +--- src/com/android/phone/MobileNetworkSettings.java | 2 +- src/com/android/phone/NetworkQueryService.java | 11 ++- src/com/android/phone/NetworkSetting.java | 5 +- src/com/android/phone/NotificationMgr.java | 91 ++++++++++++++++--- src/com/android/phone/OtaUtils.java | 16 +--- src/com/android/phone/PhoneGlobals.java | 37 +------- src/com/android/phone/PhoneInterfaceManager.java | 2 +- src/com/android/phone/PhoneUtils.java | 67 +------------- .../android/phone/vvm/omtp/SimChangeReceiver.java | 7 +- .../telephony/PstnIncomingCallNotifier.java | 10 +- .../services/telephony/TelecomAccountRegistry.java | 39 ++++++-- .../services/telephony/TelephonyConnection.java | 39 +++++++- .../telephony/TelephonyConnectionService.java | 35 +++++++ 131 files changed, 451 insertions(+), 621 deletions(-) 04d8cc0 DO NOT MERGE Use E PhoneAccount for MT ECM Call 661d806 DO NOT MERGE Register OnHoldTone event a294ae5 Fixes creation of incorrect SIP PhoneAccountHandle 0d95258 DO NOT MERGE Make android.intent.action.EMERGENCY_CALL_STATE_CHANGED protected 18f85e2 Import translations. DO NOT MERGE d0a745c Fix potential ClassCastException. cfc2d35 getPreferredNetworkType should return int[] instead of -1 on error. ca74014 Import translations. DO NOT MERGE 79be28d Import translations. DO NOT MERGE 59cacee Post updateExtras to handler to avoid potential concurrency issue. b1a2824 Import translations. DO NOT MERGE 5ccda61 Remove BluetoothManager. 6f9f5c0 Remove TDSCDMA-only menu 5ca7a9b Import translations. DO NOT MERGE 2dad7c6 Import translations. DO NOT MERGE edb2cb1 Revert "Ensure sim contacts import screen supports rotation." 831ff85 Import translations. DO NOT MERGE 06f2ca3 Ensure connection extras are propagated on start of call. 2c8b258 Allow for PSTN accounts to be marked as not emergency call capable. 779841a Fixes Telephony ProgressDialog to use system theme 04bcb68 Unregister emergency only telephony phone accounts. 38c19ab Mark emergency accounts with the correct capability for wear. be96458 Make the intent of network operator settings notification configurable. 10f9aff NetworkQueryService.onBind() should not return LocalBinder unless the intent has action ACTION_LOCAL_BINDER. 5dc9084 Add redirection of voicemail notification to a custom component. aa5a84b Add configuration flag for disabling visual voicemail. 9eab038 Move the SIM state check to the Telephony package. ========platform/platform_testing between android-6.0.1_r46..android-6.0.1_r54========= libraries/aupt-lib/Android.mk | 38 ++ libraries/aupt-lib/AndroidManifest.xml | 29 + .../android/support/test/aupt/AuptTerminator.java | 41 ++ .../android/support/test/aupt/AuptTestCase.java | 553 +++++++++++++++++ .../android/support/test/aupt/AuptTestRunner.java | 606 +++++++++++++++++++ .../android/support/test/aupt/DataCollector.java | 331 +++++++++++ .../support/test/aupt/GraphicsStatsMonitor.java | 298 ++++++++++ .../support/test/aupt/IProcessStatusTracker.java | 60 ++ .../src/android/support/test/aupt/JankStat.java | 206 +++++++ .../support/test/aupt/ProcessStatusTracker.java | 251 ++++++++ .../src/android/support/test/aupt/UiWatchers.java | 163 ++++++ .../test/launcherhelper/AospLauncherStrategy.java | 9 +- .../test/launcherhelper/CommonLauncherHelper.java | 20 +- .../GoogleExperienceLauncherStrategy.java | 14 +- .../test/launcherhelper/ILauncherStrategy.java | 13 +- tests/jank/UbSystemUiJankTests/Android.mk | 26 + tests/jank/UbSystemUiJankTests/AndroidManifest.xml | 652 +++++++++++++++++++++ .../systemui/tests/jank/LauncherJankTests.java | 269 +++++++++ .../systemui/tests/jank/SettingsJankTests.java | 112 ++++ .../systemui/tests/jank/SystemUiJankTests.java | 230 ++++++++ .../android/sysapp/janktests/YouTubeJankTests.java | 7 +- tests/jank/sysapp_wear/Android.mk | 26 + tests/jank/sysapp_wear/AndroidManifest.xml | 28 + .../wearable/sysapp/janktests/CardsJankTest.java | 100 ++++ .../sysapp/janktests/SysAppTestHelper.java | 155 +++++ tests/jank/uibench_wear/Android.mk | 26 + tests/jank/uibench_wear/AndroidManifest.xml | 28 + .../uibench/janktests/UiBenchJankTests.java | 243 ++++++++ .../uibench/janktests/UiBenchJankTestsHelper.java | 144 +++++ .../janktests/UiBenchRenderingJankTests.java | 114 ++++ .../uibench/janktests/UiBenchTextJankTests.java | 153 +++++ 31 files changed, 4909 insertions(+), 36 deletions(-) e34a2bf YouTube jank test fix 5cc2d27 Added Automated User Profile Test runner d7e8f0d Bringup System app Jank tests for clockwork. Updated MIN frames and some code clean up. 13a6c45 move UbSystemUiJankTests to open source location a794ccf Remove reference to UiObjectNotFoundException that are never thrown 9b88fdf Fixes wakeup issue on some of the wear devices ebf81a4 UiBench Jank Tests adapted for clockwork 54ed832 Revert "UiBenchJankTests for Wear." 0db51d1 UiBenchJankTests for Wear. 5581e68 test improvement: dump window hierarchy line by line ========platform/system/bt between android-6.0.1_r46..android-6.0.1_r54========= bta/hf_client/bta_hf_client_at.c | 2 +- bta/hf_client/bta_hf_client_main.c | 6 ++- btif/include/btif_api.h | 17 ++++++ btif/include/btif_storage.h | 12 +++++ btif/src/bluetooth.c | 22 +++++--- btif/src/btif_config.c | 34 ++++++++++-- btif/src/btif_dm.c | 10 ++++ btif/src/btif_hf.c | 2 +- btif/src/btif_hh.c | 9 +++- btif/src/btif_media_task.c | 8 ++- btif/src/btif_rc.c | 10 ++-- btif/src/btif_storage.c | 24 +++++++++ device/include/interop.h | 21 +++----- device/include/interop_database.h | 37 ++++++++++++- device/src/interop.c | 103 +++---------------------------------- device/test/interop_test.cpp | 20 ------- main/bte_main.c | 5 -- stack/btm/btm_dev.c | 4 +- stack/rfcomm/rfc_mx_fsm.c | 1 + test/bluedroidtest/bluedroidtest.c | 2 +- test/suite/cases/adapter.c | 2 +- test/suite/main.c | 2 +- tools/bdtool/bdtool.c | 16 +++--- 23 files changed, 198 insertions(+), 171 deletions(-) 10f25d9 DO NOT MERGE btif: check overflow on create_pbuf size 297114e Add guest mode functionality (2/3) cc684ee btif: Don't persist remote devices to the config 9c5bc29 DO NOT MERGE Check size of pin before replying 388db89 DO NOT MERGE Remove Porsche car-kit pairing workaround 04e4c54 Additional headsets blacklisted for absolute volume 79dc36d Do not send AT+CHLD=? if the 3-way call feature is not supported a8bb3ae DO NOT MERGE ANYWHERE Disable 3Mbps packets for AVDT ACL links 39f2d63 Per Motorola, we're going to revert this change and submit Moto-specific code for this. 5707038 Offload config save functionality to BTIF thread dc0909c Additional headsets blacklisted for absolute volume 26bb308 Disable 3Mbps packets for AVDT ACL links 420dfac A2DP task media alarm non-null protection b32b3d7 Fix bug where a bonded device could enter BONDING and BONDED states again. 7bc89ee Fix crash in HFP client's +COPS parsing code. 61b8ebf Only send first 16 characters of operator name in +COPS. a8ace38 Fix crashes with lots of discovered LE devices 05419c8 Fix crashes with lots of discovered LE devices bef3492 DO NOT MERGE Blacklist devices for absolute volume control 22c5f47 Revert "Blacklist devices for absolute volume control" 2c8897c Blacklist devices for absolute volume control 786a7e5 DO NOT MERGE ANYWHERE net_test_bluetooth: replace with gtest variant 9b0aa81 Fix absolute volume reporting if AVRC_ADV_CTRL_INCLUDED is false 198abcd Fix BT connection failures e52633c DO NOT MERGE ANYWHERE: osi: Remove error_fclose goto and redundant fflush. 02f35e6 DO NOT MERGE ANYWHERE: Add file write error checks to config_save 797ac5e DO NOT MERGE ANYWHERE Rename gtest_net_test_bluedroid to gtest_net_test_bluetooth. 17e048f DO NOT MERGE Revert "A2DP SRC offload support" a09c5aa DO NOT MERGE Revert "Make default SBC bitrate configurable by device." 775667a DO NOT MERGE Revert "Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE." 95004fd Mark secure link as authenticated for LE 8b1c7af Always send a SUSPEND_CFM event when suspended due to A2DP RECONFIGURE. 5f30839 Make default SBC bitrate configurable by device. 6ff83ab A2DP SRC offload support ecb3b83 Only initiate codec negotiation if feature is supported 76d0401 Fix broken test caused by misordered callback arguments. 03d1711 Always update remote address type during LE scan 7312c6d Fix bug in SDP 128-bit UUID lookup 4da5ccf Do not mask out secure connections (SC) bit for BT <4.2 864e773 Serialize remote version query over LE b8cc54d DO NOT MERGE Use POSIX timer API for wake alarms instead of OSI callouts. 25efb50 DO NOT MERGE Directly acquire wake locks from the Bluetooth stack. 3f795d9 Implementation of net_test_bluedroid as a GTest. 0fa8cd4 Send current RPA instead of pseudo-address on connect. f060365 Add a SCO routing command to net_hci. ========platform/system/core between android-6.0.1_r46..android-6.0.1_r54========= adb/adb.cpp | 2 +- adb/commandline.cpp | 6 +- libcutils/sched_policy.c | 6 ++ logcat/logcat.cpp | 2 +- logcat/tests/logcat_test.cpp | 134 ++++++++++++++++++++++++++++++++++++++----- rootdir/init.rc | 13 ++++- rootdir/init.trace.rc | 2 + sdcard/sdcard.c | 17 ++++++ toolbox/lsof.c | 7 ++- 9 files changed, 164 insertions(+), 25 deletions(-) f189e5f Fix scanf %s in lsof. 2300998 Fix overflow in path building 8b25673 Don't demangle symbol names. 213af3a Don't create tombstone directory. ac5175f [DO NOT MERGE] Use FUSE_SHORTCIRCUIT if available df2d782 Mount debugfs earlier regardless build variant d31cb63 Fix logspam from system-background cpuset. f7aad11 Re-derive permissions after package changes. 2f18b54 logcatd: up size from 16MB to 256MB a53ec32 DO NOT MERGE: add support for new sched tracepoint 6eee56c Improve cpuset support for surfaceflinger. 5b0d59d logcat: continue where we left off f6891c0 Add macro to call event logger for errors. 9a86c28 Add macro to call event logger for errors. DO NOT MERGE f34258f Add macro to call event logger for errors. DO NOT MERGE 4fd8210 Add macro to call event logger for errors. DO NOT MERGE 653316a logd: pruning time horizon 36b24a4 Remove __DATE__/__TIME__ from init and debuggerd d917514 Fix incorrect check of descsz value. 5b65f86 Backport missing null check in "adb get-state". 24f165f Minimal fix for adb backup. ========platform/system/extras between android-6.0.1_r46..android-6.0.1_r54========= ANRdaemon/ANRdaemon.cpp | 637 +++++++++++++++++++++++++++++++++++ ANRdaemon/Android.mk | 18 + libpagemap/include/pagemap/pagemap.h | 30 ++ libpagemap/pm_map.c | 11 +- libpagemap/pm_memusage.c | 103 ++++++ libpagemap/pm_process.c | 9 + librank/librank.c | 7 +- procrank/procrank.c | 127 ++++++- showmap/showmap.c | 18 +- verity/verify_boot_signature.c | 2 +- 10 files changed, 932 insertions(+), 30 deletions(-) e2534e3 Fix showmap SIGSEGV. 76617dd librank: fix pm_memusage_t init and layout 9f82eca Showmap: show swap. 08ea6e7 procrank: add proportional swap accounting 5e20c25 procrank: Fix some printf alignements aa5a7df Swap column in procrank not reported with swap enabled 3c1f664 DO NOT MERGE Update rand_emmc_perf makefile. 241ffaf Prepare for BoringSSL update. 2b28ca2 Add a system tool - ANRdaemon ========platform/system/gatekeeper between android-6.0.1_r46..android-6.0.1_r54========= Android.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) 3c4cbf7 Add static gatekeeper library ========platform/system/keymaster between android-6.0.1_r46..android-6.0.1_r54========= ee62ff1 Fix build failure caused by merge from DR. 6d7f048 Return correct error from keymaster0engine for large RSA input ========platform/system/media between android-6.0.1_r46..android-6.0.1_r54========= camera/docs/docs.html | 19 +++++++++++++------ camera/docs/metadata_properties.xml | 14 +++++++++----- 2 files changed, 22 insertions(+), 11 deletions(-) 30bf75b Camera: update FPS range spec 0429269 Camera: Documentation updates ========platform/system/security between android-6.0.1_r46..android-6.0.1_r54========= ddab0bb Limit maximum number of concurrent keystore operations. 358bd11 Prepare for BoringSSL update.