Commit Graph

5588 Commits

Author SHA1 Message Date
Varun Shah
b53b34487b Use language tags to store Configuration's locale list.
Instead of storing each Locale within a Configuration object's locale
list by its language, country, variant, and script to proto, store the
entire locale list by its language tags representation which accurately
describes each locale.

Bug: 140197723
Test: atest ConfigurationTest
Test: atest UsageStatsDatabaseTest
Test: manually with bad data
Merged-In: I53946ed4e31de0ffe9c84875c391a7dec6f5375a
Change-Id: Idaae690f79a5c680ad0059a52be62160d9dfb5e7
(cherry picked from commit 5e67462971)
2019-10-22 22:52:49 +00:00
Neil Fuller
3150e58082 Merge "Make TimeDetectorService more aware of origin"
am: 4ef2551dfa

Change-Id: I27866cf74b779bb0040f4ace384207047ca6838f
2019-10-21 11:53:20 -07:00
Neil Fuller
4ef2551dfa Merge "Make TimeDetectorService more aware of origin" 2019-10-21 18:33:31 +00:00
Anna Trostanetski
d8891ccab7 Merge "Add a unit test for ChangeReporter."
am: 7b5773765f

Change-Id: I4af55d71ed16a1e4702ed02a5751105f33327cbb
2019-10-21 05:20:09 -07:00
Neil Fuller
af3eeaf431 Make TimeDetectorService more aware of origin
Make TimeDetectorService more aware of a time signal's origin by making
the time signal from telephony less generic.

When TimeDetectorService was written it was assumed that the TimeSignal
could be generic and there would just be a String source identifier to
indicate origin.

With multiple SIMs / phones on a device it makes sense to keep track of
the originating phone of the signal so that the time detector service
could implement stickiness if it wanted. This would avoid a device
alternating back and forth between two signals and help with debugging.

As new signals are added, new "suggestXxxxTime()" methods will be added
to TimeDetectorService. That is the point at which the strategy for
ranking different sources can be decided. e.g. should NTP always rank
higher than NITZ?

The main change here is that TimeSignal is renamed to
PhoneTimeSuggestion to indicate it's only for use by signals from
telephony, sourceId has been removed and it has been given a phoneId
instead. Extra free-form metadata (mDebugInfo) has been added to assist
with logging / debugging.

Bug:140712361
Test: atest android.app.timedetector
Test: atest com.android.server.timedetector
Change-Id: I5305c34516e5f4e254309193183f00e054801a46
2019-10-21 08:42:50 +01:00
atrost
46333daeb1 Add a unit test for ChangeReporter.
Separate the decision on whether to log to two separate ones - logcat
and statsLog to allow separate policies.
Also add startLogAll and endLogAll in preparation for an adb command
that will enable/disable logging to logcat every time.

Test: atest ChangeReporterTest
Bug: 138374585
Bug: 140910281

Change-Id: Ie49368b838a19845f51a2670035f611d3e4b9a1b
2019-10-18 15:33:41 +01:00
TreeHugger Robot
ee4eb8c39d Merge "DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master" into stage-aosp-master 2019-10-15 00:24:25 +00:00
Xin Li
5c4d37fc17 DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
Bug: 141248619
Change-Id: I078f35ceef06ae7d08c5de385fd023c71c1ecbac
2019-10-14 22:54:53 +00:00
Neil Fuller
209c74f8b6 Merge "Make TimestampedValue Parcelable"
am: 81a705690b

Change-Id: I68edcf15ec9bef69a26267d9bf0c036e38ce93d4
2019-10-14 11:43:18 -07:00
Treehugger Robot
81a705690b Merge "Make TimestampedValue Parcelable" 2019-10-14 18:33:43 +00:00
Xin Li
019d9d0bf7 Merge "DO NOT MERGE - Merge QP1A.191005.007 into master" 2019-10-11 02:56:40 +00:00
Neil Fuller
def77b5cd5 Make TimestampedValue Parcelable
Make TimestampedValue Parcelable for simplicity.

TimetampedValue objects are not generally parcelable, depending on the
type of the value held. Previously, TimestampedValue did not implement
Parcelable to avoid committing to a general contract. Developers
parceling TimestampedValue objects were expected to call
TimestampedValue.writeToParcel() / TimestampedValue.readFromParcel()
explicitly when they knew it was safe to do so. This also meant that
TimestampedValues couldn't be used directly via AIDL.

This change makes TimestampedValue parcelable because it's more
familiar / convenient. Attempts to marshall a TimestampedValue that
contains a non-parcelable value will still throw a RuntimeException.

Bug: 140712361
Test: atest android.util.TimestampedValueTest
Change-Id: I8ca9c72f0433b380ce720cd813f650e743b3ddae
2019-10-10 10:16:41 +01:00
Xin Li
8efb8c35f1 DO NOT MERGE - Merge QP1A.191005.007 into master
Bug: 142297020
Merged-In: Ifc7254ab3a5272b056cbc75233aa2dfa8219ea84
Change-Id: Ib4566cec52912a8daa86c317fd99d6d60ef1524f
2019-10-10 00:28:04 +00:00
Alex Light
d3337c9051 Merge "Perform agent startup-attach before bind"
am: 7ae1299cdd

Change-Id: I9fc9f0daa019ce8110154d8ede8f269b7d3bfea9
2019-10-09 14:42:15 -07:00
Alex Light
7ae1299cdd Merge "Perform agent startup-attach before bind" 2019-10-09 21:25:48 +00:00
Alex Light
2d0691c7e1 Perform agent startup-attach before bind
We were performing agent startup-attach during bind but this was too
late for some agents, as it occurred after Context was created. Change
implementation to make this occur prior to bind.

Test: atest CtsJvmtiAttachingHostTestCases
Bug: 142010970
Change-Id: I5f75e8b3c508116762b7863d9b47251d0e808ea9
2019-10-08 11:09:53 -07:00
easoncylee
d49a61b08c Merge "Prune BugreportManagerTestCases out of general-tests."
am: 217ec71c8d

Change-Id: Ie70bf12dbdc4e5e5c6702de912c427ae3b0b74e8
2019-10-03 21:54:07 -07:00
easoncylee
c90519732e Prune BugreportManagerTestCases out of general-tests.
These tests define test_suite as 'general-tests' only but not used in
Test Mapping Suite. Hence, we plan to prune them to reduce size/build
time of general-tests.zip. They are listed as below:
 - BugreportManagerTestCases

Bug: 139893779

Test: m general-tests
      atest BugreportManagerTestCases

Change-Id: I093772ee5ab35f6218f2b0c7e74192ae171e05bc
2019-10-01 17:08:18 +08:00
Varun Shah
57213b0ce5 Use language tags to store Configuration's locale list.
Instead of storing each Locale within a Configuration object's locale
list by its language, country, variant, and script to proto, store the
entire locale list by its language tags representation which accurately
describes each locale.

Bug: 140197723
Test: atest ConfigurationTest
Test: atest UsageStatsDatabaseTest
Test: manually with bad data
Merged-In: I53946ed4e31de0ffe9c84875c391a7dec6f5375a
Change-Id: Idaae690f79a5c680ad0059a52be62160d9dfb5e7
(cherry picked from commit 5e67462971)
2019-09-16 20:56:34 +00:00
Madhava Srinivasan
a40f432ac6 Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService"
am: 4efb0c510d

Change-Id: Ic60d7d5bf75288f9f6cdf02d414bf69dbfe74159
2019-09-13 10:24:22 -07:00
Treehugger Robot
4efb0c510d Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService" 2019-09-13 16:58:19 +00:00
Madhava Srinivasan
154e0193ce Honor HDMI_CONTROL_ENABLED setting in AudioService
This change updates how AudioService is updated of changes to Hdmi Cec
status (enable/disable) and availablity.

Bug: 138956107
Bug: 138373017
Test: Android TV STB: make; flashall;Volume -/+; HDMI control enable/disable.
Change-Id: Iaf83a45206be076858e13d113ba772ed5c59ef60
Merged-In: Iaf83a45206be076858e13d113ba772ed5c59ef60
2019-09-12 22:14:59 +00:00
Xin Li
d57e959e71 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
Bug: 135460123
Change-Id: I65906d82b14125c0893d5cde0cfebb73bf9e38ab
Merged-In: I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9
2019-09-10 11:16:29 -07:00
qiwang
ae32f7e599 Don't clear the output array if it failed to open the proc status file
According to the original documentation, the functions in Process.java
should return -1 when the process doesn't exist,this should be detected
by Process.readProcLine() when it fails to open the /proc/<pid>/status
file. Unfortunately readProcLine() zeroes-out the output array before
attempting to open the file, so the expected return value -1 is changed
to be 0  when the process doesn't exist. It's inconsistent with the
interface description definition, so correct it.

Test: try to use Process.getUidForPid(int pid) api to read a non-existent
process pid's uid, it will return -1 instead of 0.

Merged-In: Ic2ac7defea8b15dd65f907d04e168a1283a4f621
Change-Id: Ic2ac7defea8b15dd65f907d04e168a1283a4f621
Signed-off-by: qiwang <wangqi_a@xiaomi.com>
2019-09-06 14:14:33 -07:00
Xin Li
a770df1d2e DO NOT MERGE - Merge build QP1A.190711.019 into stage-aosp-master
Bug: 139893257
Change-Id: I94fce9c5c0b35cbb88ee27fa4cd037927964d2cd
2019-08-24 05:22:23 +00:00
Adrian Salido
9b94c35a54 Merge "DO NOT MERGE DMD: Support minimum refresh rate" into qt-r1-dev 2019-08-22 02:09:34 +00:00
Long Ling
86ce8f764b DO NOT MERGE DMD: Support minimum refresh rate
Bug: 139685237
Change-Id: Ib41dee351276d70733fffa18620455e4e6f9ddfc
2019-08-21 13:42:03 -07:00
Kevin Chyn
709b0a4a74 Merge "Remove unused setting" into qt-r1-dev
am: 95a675ce91

Change-Id: Ia72e5c6625f8213c807966312550111bcbdcb767
2019-08-19 15:08:45 -07:00
Kevin Chyn
95a675ce91 Merge "Remove unused setting" into qt-r1-dev 2019-08-19 21:50:22 +00:00
Kevin Chyn
d806bc4c11 Remove unused setting
Bug: 139554930

Test: manual
Change-Id: I5c4af200b0c61efb9a0f76d00c2f047d4880d77b
Merged-In: I5c4af200b0c61efb9a0f76d00c2f047d4880d77b
2019-08-17 04:52:47 +00:00
Xin Li
80860803a4 DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master
Bug: 134405016
Change-Id: I303c0268e8e454b0f0f460eb286812a50c9add88
2019-08-14 12:04:06 -07:00
Steven Moreland
5009264077 Merge "Fix ParcelNullabilityTest." into stage-aosp-master am: dc6a23bab9
am: bddb4d69d2

Change-Id: I8b997f0d58915bda34399cd16faad41b7a69b4d9
2019-08-08 19:51:19 -07:00
Steven Moreland
bddb4d69d2 Merge "Fix ParcelNullabilityTest." into stage-aosp-master
am: dc6a23bab9

Change-Id: I1947283d25646717d2543493d7569848e09a7650
2019-08-08 19:35:40 -07:00
Steven Moreland
42fb0c80fb Fix ParcelNullabilityTest.
Test: atest android.os.ParcelNullabilityTest
Fixes: 138999297
Change-Id: I0f5c09a1e8f7a2927409f228a566988d949f34c7
2019-08-08 11:15:35 -07:00
Adrian Roos
9546c97709 Merge "GestureNav: Fix AbsSeekBar thumb exclusion" into qt-r1-dev
am: 92f61f0323

Change-Id: Ib0fd305bbf70a33c4d66808a3e3ffca8376c07ad
2019-08-07 09:56:51 -07:00
Adrian Roos
7c7898e74f GestureNav: Fix AbsSeekBar thumb exclusion
Fix two issues that caused the exclusion for SeekBar thumbs to be to small and offset
from the thumb:

Account for padding and thumb offset; the thumb drawable is drawn with an offset
from the View's Canvas; the same offset must be applied when udpating the exclusion
rects.

The thumb is typically much smaller than the drag zone; the thumb rect alone doesn't
provide an appropriately large exclusion for reliably hitting it, so it is enlarged
to the height of the seek bar (up to 48dp).

Bug: 138992366
Test: manual, show exclusion zones with: adb shell setprop debug.pointerlocation.showexclusion 150 && adb shell settings put system pointer_location 1
Test: atest android.widget.AbsSeekBarTest
Change-Id: I2b670c6f3f33451bdccdfd3d75a75e90260257ff
2019-08-07 15:09:26 +02:00
Dan Shi
a88f18a5c7 Merge "Fix dependency on APK used by test" am: 85d2ac2e12 am: 6bbd7c4cc6
am: 2f62154908

Change-Id: I0bfeac966366c6c6eace47b79470f2e0e798adc6
2019-08-05 14:43:25 -07:00
Dan Shi
2f62154908 Merge "Fix dependency on APK used by test" am: 85d2ac2e12
am: 6bbd7c4cc6

Change-Id: Iafa0383ba571d4c72e37ca7f2b68f1cb7a0bc025
2019-08-05 14:30:29 -07:00
Dan Shi
6bbd7c4cc6 Merge "Fix dependency on APK used by test"
am: 85d2ac2e12

Change-Id: I1ae6bff68d4aa4890fee47b5943e4d3420c32ed2
2019-08-05 14:19:06 -07:00
Treehugger Robot
85d2ac2e12 Merge "Fix dependency on APK used by test" 2019-08-05 21:04:28 +00:00
Steven Moreland
7976aee698 Merge changes from topic "libbinder-bitness-header" into stage-aosp-master am: baa900adda
am: a879c6860a

Change-Id: Ia5fb1eb1aa622c23078b8311c4faf208e80569e3
2019-07-31 14:04:15 -07:00
Steven Moreland
a879c6860a Merge changes from topic "libbinder-bitness-header" into stage-aosp-master
am: baa900adda

Change-Id: I94bc65d02b992270e67e5c25a45df1e9496891f0
2019-07-31 13:44:59 -07:00
Steven Moreland
1d28afeb64 ParcelTest: use different work source for updates
We can improve the test slightly by using a different value when we
update work sources.

Bug: N/A
Test: android.os.ParcelTest
Change-Id: I5f4905667842a63d31839d610c405333b915cae8
2019-07-31 09:14:01 -07:00
Steven Moreland
ccd131c0d5 Remove test assumption of interface token layout.
Since it is not API.

Bug: 138691255
Test: atest android.os.ParcelTest
Change-Id: I1c51344151bf3ae5b6424e75195782aec8064246
2019-07-31 09:13:23 -07:00
Kalesh Singh
5f669a5009 Merge "Get native wakelock stats from SystemSuspend if /sys/class/wakeup not available." am: dec3796249 am: 8ad549cdf2
am: 9c1224cfa3

Change-Id: I31802f57dcf2e6fc4fd509ea95864259ab90565a
2019-07-30 12:15:24 -07:00
Kalesh Singh
9c1224cfa3 Merge "Get native wakelock stats from SystemSuspend if /sys/class/wakeup not available." am: dec3796249
am: 8ad549cdf2

Change-Id: I8a3b3915759ba06ec673d21e609ed4d82078eaa1
2019-07-30 12:00:39 -07:00
Kalesh Singh
8ad549cdf2 Merge "Get native wakelock stats from SystemSuspend if /sys/class/wakeup not available."
am: dec3796249

Change-Id: I994a051e37e53417ab8df6df13318adcf071945b
2019-07-30 11:36:12 -07:00
Kalesh Singh
eedacc3221 Get native wakelock stats from SystemSuspend if /sys/class/wakeup not available.
If /sys/class/wakeup is available, get both kernel and native wakelock
stats from SystemSuspend, else we get native wakelock stats from
SystemSuspend and fallback to /d/wakeup_sources for kernel wakelock
stats.

Bug: 128923994
Test: atest FrameworksCoreTests:KernelWakelockReaderTest
Test: Compare dumpsys suspend_control against
      dumpsys batterystats --checkin | grep kwl
      to verify BatteryStats is getting wakelock stats
      from SystemSuspend.

Change-Id: I08e56c984b903285bb965dd853dae4a63fdeb824
2019-07-26 17:07:30 -07:00
Dan Shi
bcef6ae6bc Fix dependency on APK used by test
Use data attribute to include the APK used for the test.

Bug: 138416078
Test: atest
Change-Id: Iffeca6c5f487c6a164acb9c880a5b6405eff424d
2019-07-26 14:16:43 -07:00
Kalesh Singh
7faeb8c82f Merge "Get wakelock stats from SystemSuspend" am: dff4801d6b am: 7c7c466e1b
am: bd2c24e1d1

Change-Id: I27016c9f7cb7914f89f608ff0ba1b47d3c677579
2019-07-25 00:51:12 -07:00