summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-14Merge cherrypicks of [6391991, 6392011, 6391992, 6391993, 6392031, 6392051, ↵android-9.0.0_r35pie-qpr2-releaseandroid-build-team Robot
6392052, 6392091, 6392111, 6392032, 6391994, 6391995, 6391996, 6391997, 6391998, 6391999, 6392000, 6392001, 6392002, 6392003, 6392004, 6392005, 6392006, 6392112, 6392113, 6392151, 6392152] into pi-qpr2-release Change-Id: I3808395b49e1416d2f5107d926b1b713e17828b7
2019-02-14Be more comprehensive about boot time RTC checkChristopher Tate
If we detect that the RTC is uninitialized at boot time, we advance to the nearest safe estimated time that we can determine. We can't necessarily touch read/write filesystems at this point, so we have been using the timestamp of the root filesystem. Unfortunately, on retail devices that timestamp is often artificial, and quite far in the past by today's standards (e.g. some time in 2009). We now consult a variety of milestones to get a better estimate for the latest possible "the current date cannot be earlier than this" reference point: the root filesystem timestamp, the Build.TIME system variable, and the [ro.build.date.utc] system property if available. The latter two, in particular, are typically within at most two years of the current real time/date, rather than the eight or nine years of offset that we see with the root filesystem timestamp. This is a cherrypick of a later change back to Android P. Test: manually boot with system time forced to the 0 epoch Test: CTS Bug: 65354678 Bug: 63711349 Bug: 122883482 Merged-In: I36bbe6dfebba79ad83ce536917d6893427a026dd Change-Id: I36bbe6dfebba79ad83ce536917d6893427a026dd (cherry picked from commit bfbd98868e56064f1c4813dcdbaedf87ced526ea)
2019-01-16Merge cherrypicks of [6072697, 6072075, 6072758, 6072124, 6072885, 6072886, ↵android-9.0.0_r34android-build-team Robot
6072887, 6072580, 6072581, 6072582, 6072583, 6072584, 6072132, 6072195, 6072133, 6072077, 6072134, 6072078, 6072211, 6072762, 6072763, 6072908, 6072909, 6072910, 6072911, 6072912, 6072913, 6072914, 6072930, 6072212, 6072743] into pi-qpr2-release Change-Id: I9f800670c887affef352d47aa6f83fe4e282b91a
2019-01-16DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614eAdrian Roos
Fixes an issue where setting a password via DPM would never satisfy a QUALITY_COMPLEX password requirement. Change-Id: I3fbc952bd44291ac22728c626b128fc0c1aae232 Merged-In: I3fbc952bd44291ac22728c626b128fc0c1aae232 Fixes: 120915644 Bug: 110172241 Test: atest 'com.android.cts.devicepolicy.DeviceAdminHostSideTestApi24#testRunDeviceOwnerPasswordTest' Test: Set credential via DPM.resetPassword(), factory reset device to trigger FRP, verify FRP shows. (cherry picked from commit ea8d82c08a9d489a48ef810d7c40a4d20f806aa0) (cherry picked from commit b122ae9660526c83d4a7bf1c1f99107afee23001)
2019-01-16RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters.Abodunrinwa Toki
Also don't show smart actions for selections in text with unsupported characters. Bug: 116321860 Test: atest android.view.textclassifier.TextClassificationManagerTest \ android.text.util.cts.LinkifyTest \ android.text.util.LinkifyTest \ android.widget.TextViewActivityTest Change-Id: I01b5e936aa4dfc937a98f50e9fc8171666861a61 (cherry picked from commit a69950ce18f85ea8514083a5e175450e17e93565)
2019-01-16Adding SUPL NI Emergency Extension TimeWyattRiley
Configurable by carrier config.xml resource Bug: 118839234 Bug: 115361555 Bug: 112159033 Test: On device, see b/115361555#comment14 Change-Id: I52e61656cca8b6fa6468d32d2e69bf60f4c83c61 (cherry picked from commit a725dd6650846090f70ed9811f1a94f036ab3f29)
2019-01-16FRP: save password quality in DPM.resetPasswordAdrian Roos
When setting a password from DPM.resetPassword(), the actual quality of the password was not passed to LockSettingsService (instead, the minimum required quality was passed which is often UNSPECIFIED). As a result, during FRP we would see inconsistent state and skip it. Bug: 110172241 Test: Set credential via DPM.resetPassword(), factory reset device to trigger FRP, verify FRP shows. Change-Id: I54376f60ac53451ace22965d331b47cd8c2e614e Merged-In: I54376f60ac53451ace22965d331b47cd8c2e614e (cherry picked from commit 7923b3c10cad5059a7d187fa6abc39abdb4173ec)
2018-12-05Merge cherrypicks of [5704859, 5705300, 5704034, 5704195, 5705082, 5704058, ↵android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-build-team Robot
5704059, 5704932, 5705340, 5705341, 5705342, 5705343, 5705344, 5705361, 5705362, 5705363, 5705364, 5704870, 5704196, 5705083, 5701785, 5701786, 5701787, 5704035, 5705261, 5705281, 5704036, 5704037, 5704038, 5704871, 5704933, 5704872, 5705347, 5705262, 5704934] into pi-qpr2-release Change-Id: Ifb7d048c4deb34b18e69173fd09e91c45980e2d9
2018-12-05Bluetooth: Check descriptors size in BluetoothHidDeviceAppSdpSettingsJakub Pawlowski
Bug: 119819889 Test: compilation Change-Id: If51d0e2af74d99758f79a603d40cc2f5c84e4dde (cherry picked from commit 63519217e8c0682369b5b3dc11417f79b3b48b7e)
2018-12-05RESTRICT AUTOMERGE: Added an app id security check in isAppForeground.Varun Shah
ActivityManagerService#isAppForeground now checks if the caller has the permission to view if an app is in the foreground. Bug: 115384617 Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.ActivityManagerTest#testIsAppInForegroundNormal Test: cts-tradefed run cts -m CtsSecurityTestCases -t android.security.cts.ActivityManagerTest#testIsAppInForegroundMalicious Change-Id: I9602c89b2d40036e525c38960a08326dc74c6682 (cherry picked from commit 273eb0918adbc7cd410a583b0d25c518b9b1e35e)
2018-12-05Change types of fields of network stats reported to framework.junyulai
Currently, NetworkStats use int to handle uid, set and tag, while native side using unsigned int mixing with signed int with that. This commit make necessary changes in JNI part while libnetdbpf unifying the types of fields. Bug: 112226716 Bug: 119193941 Test: 1. manually reconnect vpn 2. update apps from playstore 3. atest libnetdbpf_test 4. runtest frameworks-net 5. cts-tradefed run cts -m CtsUsageStatsTestCases -t \ android.app.usage.cts.NetworkUsageStatsTest Change-Id: I6c27124db8292e2825fba51b8994f013897cb566 Merged-In: I6c27124db8292e2825fba51b8994f013897cb566 (cherry picked from commit bf7803eed8283d5a1caa2efe90aa449590ddb94f) (cherry picked from commit f5bc6f61b41f62d572bbe5a66797b1f5a8103676)
2018-12-05Fix negative uid stats caused by 464xlat adjust when eBPF is on.junyulai
When using xt_qtaguid to count per uid stats, NetworkStatsService needs to adjust the 464xlat traffic since iptables module would double count for ipv4 and ipv6 packet. But for eBPF, the per uid stats is collected in a different hook, so the adjustment on root uid would only be needed in tx direction. Bug: 112226716 Test: 1. Make ipv4 traffic in ipv6-only network and check data usage. 2. Make ipv4 traffic in a client which connect to ipv6-only hotspot. 3. runtest frameworks-net 4. cts-tradefed run cts -m CtsNetTestCases -t \ android.net.cts.TrafficStatsTest 5. cts-tradefed run cts -m CtsUsageStatsTestCases Change-Id: Ic9a84f5446eddc943c255d5f3b89dad171f53cac Merged-In: Ic9a84f5446eddc943c255d5f3b89dad171f53cac (cherry picked from commit c33ac0d43b594f6154accf03ae7e3fd34dedc79d) (cherry picked from commit eda8aa1f46d3bccb089fb5e8feea07d7fe6867a0)
2018-11-30Merge cherrypicks of [5656146, 5653357, 5656373, 5656227, 5656421, 5654207, ↵android-build-team Robot
5654208, 5654209, 5654210, 5656164, 5656412, 5656413, 5656355, 5656356, 5656357, 5655631, 5655632, 5656165, 5656166, 5656167, 5656168, 5656376, 5656422, 5656147, 5656148, 5656149] into pi-qpr2-release Change-Id: Ia06b15840daac2770460c29691d3fafbdbe2842f
2018-11-30DO NOT MERGE Fix the icon overlay after density changefelkachang
After showing the heads up for the fullscreen notification, to change the density by user will have the status bar icons not show normally. It will the only one icon overlay on the clock but actually there are more than one icons. And, it can't back to normal after expandable notification and collapse the notification panel. The root cause is that all of instances of PhoneStatusBarView, Clock, HeadsUpStatusBarView, and HeadsUpAppearanceController are recreated by FragmentManager after configuration density and font changing. The new HeadsUpAppearanceController status is neither consistent with HeadsUpManager's status nor the state of the previous instances. The solution is that to apply the onSaveInstanceState and onRestoreInstanceState in PhoneStatusBarView, Clock, PanelBar, and HeadsUpStatusBarView. To make sure that the values of the fields in the new instance, which are set by other source, have the consistence with the state of the old instances. HeadsUpAppearanceController's Constructor. To hook onLayoutChangedListener to sync the status with HeadsUpManager's status to HeadsUpStatusBarView if there is a pinnded heads up notification. In original, PanelBar.mState is the only one state to save. Instead of only saving one, to save the view tree state in CollapsedStatusBarFragment.onSaveInstanceState and restore the view state in CollapsedStatusBarFragment.onViewCreated. CollapsedStatusBarFragment.mDisabled1 doesn't need to save and restore because CommandQueue.recomputeDisableFlags will give it the correct value. After density changed, RemoteViews will reinflate the instances of NotificationHeaderView and the wrapper instances of NoticationContentView will also recreated in NotificationContentView.setAmbientChild. The recreated instance should synchronized with the ExpandableNotificationRow intance. Bug: 80224819 Fixes: 111996469 Fixes: 117818441 Test: atest SystemUITests Change-Id: I08ace5633ae228d329cb6d8881eed2b37704ae8f Merged-In: I7b92af7c3cf6290ec58ac13bf295f63b0b36332f (cherry picked from commit c769caafffa632937a3a66fb91c5bf821d5d3d05)
2018-11-26Snap for 5140444 from 294484563c94eedd70f8dd53d134d701a1d6e9cb to ↵android-build-team Robot
pi-qpr2-release Change-Id: Iae8b94ce89b79e0e3fd9f0e2daf7d186660f2df9
2018-11-21Snap for 5143169 from 807672ac4fcd5b877fd7a404f22595cd9ae7ad0a to ↵android-build-team Robot
pi-qpr2-release Change-Id: I679936796f8e82f1d510e317b4036299128ad06c
2018-11-20Merge "docs: Removing @see link to hidden field" into pi-devAndrew Solovay
2018-11-19[automerger skipped] Merge "RESTRICT AUTOMERGE: Added an app id security ↵Varun Shah
check in isAppForeground." into oc-dev am: 546ba589a2 am: 84376cb95a am: abff788177 -s ours Change-Id: I79b6c04d2aca7543507f064bbe827f8d2ac9340d
2018-11-19Merge "RESTRICT AUTOMERGE: Added an app id security check in ↵Varun Shah
isAppForeground." into oc-dev am: 546ba589a2 am: 84376cb95a Change-Id: I096470de6d03ab34591b12bc7172056a1ffe38ed
2018-11-19Merge "RESTRICT AUTOMERGE: Added an app id security check in ↵Varun Shah
isAppForeground." into oc-dev am: 546ba589a2 Change-Id: I0b63c0bef57320b7465c2fe4e45304fd637e712d
2018-11-19docs: Removing @see link to hidden fieldAndrew Solovay
Docs had contained a @see link to #FIRST_SDK_INT , but that field had a @hide directive, so the @see link resulted in an error message in the output. Doc staged to: http://go/dac-stage/reference/android/os/Build.VERSION#SDK_INT Bug: 80445154 Test: make ds-docs Change-Id: Id8d461c517bd4d8b3c49b61da37ec0a16768a63d Exempt-From-Owner-Approval: Doc-only change
2018-11-19Merge "RESTRICT AUTOMERGE: Added an app id security check in ↵TreeHugger Robot
isAppForeground." into pi-dev
2018-11-19Merge "RESTRICT AUTOMERGE: Added an app id security check in ↵TreeHugger Robot
isAppForeground." into oc-dev
2018-11-19Merge "docs: Fixing typos." into pi-devAndrew Solovay
2018-11-16docs: Fixing typos.Andrew Solovay
Doc is staged to: http://go/dac-stage/reference/android/media/audiofx/AudioEffect http://go/dac-stage/reference/android/media/audiofx/AudioEffect.OnControlStatusChangeListener http://go/dac-stage/reference/android/media/audiofx/AudioEffect.OnEnableStatusChangeListener Bug: 119656338 Change-Id: I813610941ae0f317944a75687f354cc9f66e8600 Exempt-From-Owner-Approval: Doc-only change Test: make ds-docs
2018-11-16[automerger skipped] [automerger] Select only preinstalled Spell Checker ↵Guliz Tuncay
Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad am: 6bd38ca2aa am: 608d567e43 am: e5322fa084 -s ours am: 3c53f926f3 -s ours Change-Id: I441d92faa9cfd4b2d748c05236eda6921b677d7c
2018-11-16[automerger skipped] [automerger] Select only preinstalled Spell Checker ↵Guliz Tuncay
Services am: fa265ed970 am: c008f3df63 am: 8df481923f am: 6e652225ad am: 6bd38ca2aa am: 608d567e43 am: e5322fa084 -s ours Change-Id: I42907e9163fc5b58600b2fcd99088f7c49ddbcf0
2018-11-16[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 ↵Guliz Tuncay
am: c008f3df63 am: 8df481923f am: 6e652225ad am: 6bd38ca2aa am: 608d567e43 Change-Id: I5d09ecdb574e347f5f8c8c86a7f6a8ecb26e42c4
2018-11-16Merge changes from topic "sort stats" into pi-devLorenzo Colitti
* changes: Change types of fields of network stats reported to framework. Fix negative uid stats caused by 464xlat adjust when eBPF is on.
2018-11-14[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 ↵Android Build Merger (Role)
am: c008f3df63 am: 8df481923f am: 6e652225ad am: 6bd38ca2aa Change-Id: I63d8639a52f0be081b397e1bb7813d1e7e4b8aa4
2018-11-14[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 ↵Android Build Merger (Role)
am: c008f3df63 am: 8df481923f am: 6e652225ad Change-Id: Iece38d8723b40e22f86f4aa599d42dbf9a2fcbab
2018-11-14[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 ↵Android Build Merger (Role)
am: c008f3df63 am: 8df481923f Change-Id: If661d9f3206b0e9da2a98ffb14b0ff38154cd757
2018-11-14[automerger] Select only preinstalled Spell Checker Services am: fa265ed970 ↵Android Build Merger (Role)
am: c008f3df63 Change-Id: I9541ff6206955ed3479d5b4aa6c78f23304d3165
2018-11-14[automerger] Select only preinstalled Spell Checker Services am: fa265ed970Android Build Merger (Role)
Change-Id: I6a0825a14c8b0f38415cccacc315ba84eb88f5b9
2018-11-14Select only preinstalled Spell Checker ServicesGuliz Tuncay
When we are setting a new spell checker as the default one in Secure.Settings, TSMS#findAvailSpellCheckerLocked can pick up any available spell checker service. This violates the principle that user should be warned whenever we are setting an untrusted spell checker service as the default service, since the warning dialog is never shown. Fixes: 64764051 Bug: 118694079 Test: Manually as follows: 0. Make sure AOSP keyboard is pre-installed. 1. adb shell settings put --user 0 secure selected_spell_checker com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService 2. tapas SampleSpellCheckerService 3. make -j 4. adb install --user 0 -r out/target/product/generic/system/app/SampleSpellCheckerService/SampleSpellCheckerService.apk 5. adb shell pm disable com.android.inputmethod.latin 6. adb shell settings get --user 0 secure selected_spell_checker -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService 7. adb reboot 8. adb shell settings get --user 0 secure selected_spell_checker -> com.android.inputmethod.latin/.spellcheck.AndroidSpellCheckerService Change-Id: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e Merged-In: I298ffbcfa5e32f43753f54fbebc40a414a5c0f9e
2018-11-14Snap for 5130385 from 78c941d063fa60d3a3daa256105149c6a9eaa2d8 to ↵android-build-team Robot
pi-qpr2-release Change-Id: I6c7f0d60f4522dee494ef6c84c520d2140b0aaee
2018-11-13Merge "Hide wallpaper when backdrop arrives" into pi-devTreeHugger Robot
2018-11-13Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2018-11-13Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ie0f23de1ecc1c4ce58b29828989adb080ee0de51
2018-11-13Change types of fields of network stats reported to framework.junyulai
Currently, NetworkStats use int to handle uid, set and tag, while native side using unsigned int mixing with signed int with that. This commit make necessary changes in JNI part while libnetdbpf unifying the types of fields. Bug: 112226716 Bug: 119193941 Test: 1. manually reconnect vpn 2. update apps from playstore 3. atest libnetdbpf_test 4. runtest frameworks-net 5. cts-tradefed run cts -m CtsUsageStatsTestCases -t \ android.app.usage.cts.NetworkUsageStatsTest Change-Id: I6c27124db8292e2825fba51b8994f013897cb566 Merged-In: I6c27124db8292e2825fba51b8994f013897cb566 (cherry picked from commit bf7803eed8283d5a1caa2efe90aa449590ddb94f)
2018-11-13Merge "Set stealth mode during inflation" into pi-devTreeHugger Robot
2018-11-12Merge "Update system server profile" into pi-devTreeHugger Robot
2018-11-12Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2018-11-12Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ic323b33cd07325dbeb6706f8d875537a6e3edcc4
2018-11-12RESTRICT AUTOMERGE: Disable separated emergency buttonWesley.CW Wang
Test: Manually Bug: 119384606 Change-Id: I629dd42751dc80ccd434d66f95eabefc9a8164af
2018-11-11Merge "Import translations. DO NOT MERGE" into pi-devTreeHugger Robot
2018-11-11Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I8c00a67900b443175c57d71b90022a634d670263
2018-11-10Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into ↵Bill Yi
oc-dev am: bc7da75f87 am: 8c06bfb6a4 am: 77a8b4d7d7 Change-Id: Ia23aef867a97767f9800481cb3747b7ff5ba053d
2018-11-10[automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b ↵Bill Yi
skipped: 640fb0a793 am: c9590c8fc1 -s ours am: 0881f3bb25 -s ours am: 638e56b43a -s ours Change-Id: I5551e2b998d6a8fed32309b98ec8dace3066c355
2018-11-10Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into ↵Bill Yi
oc-dev am: cff099466e am: 21060a9e0d am: 72100b44e8 Change-Id: I5ca6d17de7a450265ab534d078e238408fa16f97