Commit Graph

4089 Commits

Author SHA1 Message Date
Victor Chang
857933bd2d Fix FormatterTest#testFormatShortElapsedTime due to CLDR 34 change
am: 8ac807e010

Change-Id: Id817a7c14047a1a4c6069791caab94c6e64f880e
2018-10-30 05:19:15 -07:00
Tony Zhu
371786f6b0 Merge "[Call Screening]Default call screening app setting storage." 2018-10-30 02:43:52 +00:00
tonyzhu
70526c3e95 [Call Screening]Default call screening app setting storage.
Add new string in Settings. To indicate which app is default
call screening, similar to default dialer application setting,
store this in the system settings provider.

Bug: 118416082
Test: atest SettingsBackupTest pass.
Change-Id: I39f81b31a68ee2dbb056ff935f8dea0f51720017
2018-10-26 13:40:45 +00:00
Seigo Nonaka
3e140b2403 Update test cases for HarfBuzz 2.0.2
Now HarfBuzz combines chars with ZWJ into single cluster

This is 2nd attempt of Ic642c469aab90a2ecd3874cf0dec82625ea21c1b

Bug: 117953171
Test: TreeHugger
Change-Id: I7e731500e71c1973c254ede0f316fc36e3c22576
Merged-In: I531b7a5f5727540d6d11db619eeba6eb23fb113d
2018-10-25 22:15:33 +00:00
Seigo Nonaka
52a4c07f7c Revert "Update test cases for HarfBuzz 2.0.2 DO NOT MERGE"
This reverts commit 155951f2f6.

Reason for revert: broke test in pi-dev/stage-aosp-master

Change-Id: I917e170b570b89ba2e8a26cec0bf0a8adf577b80
2018-10-25 18:23:32 +00:00
Seigo Nonaka
155951f2f6 Update test cases for HarfBuzz 2.0.2 DO NOT MERGE
Now HarfBuzz combines chars with ZWJ into single cluster

Bug: 117953171
Test: TreeHugger
Change-Id: Ic642c469aab90a2ecd3874cf0dec82625ea21c1b
Merged-In: I531b7a5f5727540d6d11db619eeba6eb23fb113d
2018-10-24 05:57:57 +00:00
Treehugger Robot
06182b0764 Merge "pm: Disallow HIDL libs from boot jars >= Q." 2018-10-22 07:08:10 +00:00
Victor Chang
8ac807e010 Fix FormatterTest#testFormatShortElapsedTime due to CLDR 34 change
Separator in French is changed in CLDR 34

Bug: 113100098
Test: atest frameworks/base/core/tests/coretests/src/android/text/format/FormatterTest.java
Change-Id: I04e4501079d57fb8ce5aefa251b6f2362b07f8f6
2018-10-22 05:03:56 +01:00
Steven Moreland
ae88825916 pm: Disallow HIDL libs from boot jars >= Q.
These two libraries:
android.hidl.base-V1.0-java
android.hidl.manager-V1.0-java

were removed from BOOT_JARS. This change disallows them to be used on
the classpath >= Q. They are still allowed to be used <= P for legacy
reasons.

Test: atest android.content.pm.AndroidHidlUpdaterTest
Test: build & boot Pixel 2
Fixes: 77307025

Change-Id: I7752812318030cbaa15f42301c168371ceade901
2018-10-17 18:17:33 -07:00
Neil Fuller
2462e2de0c Merge "Remove explicit dependencies on conscrypt"
am: ca980ac83c

Change-Id: I44d73ff073dcdd566e95dd89a08490f8afdf833f
2018-10-15 13:22:31 -07:00
Neil Fuller
071d5b22d0 Remove explicit dependencies on conscrypt
The dependency is unnecessary since conscrypt is
now included in the "standard libraries".

Test: build
Bug: 113148576
Change-Id: I5d6ae56af35fddb452fdd5b6abbb47178c1bfdc0
2018-10-15 16:25:35 +01:00
Colin Cross
bfff7e2fe8 Merge changes from topic "aapt2-manifest-elements"
am: e75f2f504e

Change-Id: I2cf054f942109e539c2439887078a6e182603456
2018-10-10 16:13:26 -07:00
Neil Fuller
64106e4399 Merge "Avoid hidden DataFormat.is24Hour field access"
am: 4d9823f3eb

Change-Id: If06ff869b5363867287cb37c86b1bf558bfa55db
2018-10-10 15:51:10 -07:00
Treehugger Robot
e75f2f504e Merge changes from topic "aapt2-manifest-elements"
* changes:
  Remove workarounds for b/79755007
  AAPT2: Add the rest of supported manifest elements
  AAPT2: Add supported manifest elements
2018-10-10 22:29:57 +00:00
Neil Fuller
953b53c2e6 Merge "Remove dependency on internal libcore method"
am: c7ae7ca343

Change-Id: Ice43bea3362a2a983f050d199514b485ce00f976
2018-10-10 14:14:19 -07:00
Neil Fuller
527de9ca59 Merge "Switch test to TestIoUtils from IoUtils"
am: 709cb7ca9f

Change-Id: I757367421f4ec93b512fc3bd7a77869a4b9def96
2018-10-10 14:02:42 -07:00
Neil Fuller
4df6279128 Avoid hidden DataFormat.is24Hour field access
DateFormat.is24Hour is not part of the CorePlatformApi but
DateFormat.set24HourTimePref(Boolean) is. Switch over.

Bug: 113148576
Test: build
Change-Id: I27103890f94cfe3679f386ea33b0450b453a7625
2018-10-10 19:13:19 +01:00
Neil Fuller
c7ae7ca343 Merge "Remove dependency on internal libcore method" 2018-10-10 15:12:21 +00:00
Neil Fuller
709cb7ca9f Merge "Switch test to TestIoUtils from IoUtils" 2018-10-10 13:57:36 +00:00
Neil Fuller
72b61e6309 Remove dependency on internal libcore method
The test already uses FileUtils.deleteContents() in several
places so the one usage of IoUtils.deleteContents() which is
functionally equivalent can be switched over to that instead.

Bug: 113148576
Test: build only
Change-Id: Ic5569c82701e89ae9178c1438caf1e8885861a76
2018-10-10 14:49:24 +01:00
Mårten Kongstad
7672daf8e5 Merge changes from topic "idmap2-prerequisites"
am: 62a5d4249f

Change-Id: I8db3f5ba0de6510c3327273c56e9fcc75c836694
2018-10-09 16:00:31 -07:00
Treehugger Robot
62a5d4249f Merge changes from topic "idmap2-prerequisites"
* changes:
  AssetManager2: optionally keep non-matching configs
  AAPT2: optionally keep resources without default value
  libandroidfw: add resource ID iterator
2018-10-09 21:43:38 +00:00
sqian
936791f536 Merge "Add Call Redirection Default Application in Settings"
am: b7c0727c15

Change-Id: Iae885868a4e985822eac0e4134b16224ee8237f6
2018-10-09 11:36:25 -07:00
Treehugger Robot
b7c0727c15 Merge "Add Call Redirection Default Application in Settings" 2018-10-09 18:06:05 +00:00
Mårten Kongstad
f99eda450f AAPT2: optionally keep resources without default value
Teach "aapt2 link" about a new flag --no-resource-removal. When given,
aapt2 will not filter out resources that lack default values. This is
useful mostly when building overlay packages that define resources for
non-default configurations, such as only for values-sv.

Test: manual: build package with resource only in values-vs, verify apk with aapt2 dump
Change-Id: Idc513bcb3f43bbff7f073163562c3dfccdb9bc9b
Merged-In: Idc513bcb3f43bbff7f073163562c3dfccdb9bc9b
2018-10-09 14:02:14 +00:00
sqian
97b6b00255 Add Call Redirection Default Application in Settings
Bug: 64959558
Test: compile
Change-Id: Iddac4d5b202db5a88aa82fd9ea4df89544b94b71
2018-10-08 16:38:41 -07:00
Neil Fuller
a0042cff58 Switch test to TestIoUtils from IoUtils
Remove a dependency on a private platform API method.

Bug: 113148576
Test: Run test
Change-Id: Iaf5bd2853b3f9d496b6450c4ffd16992fe645be2
2018-10-04 09:56:41 +01:00
Nandana Dutt
ab618e00b2 Merge "Bugreport: Fix SystemUI service from being dumped twice 1/2"
am: 99c685b0e8

Change-Id: I5d93f3a8bfc1385e629e06848f672b14a2885e6f
2018-10-03 08:54:46 -07:00
Nandana Dutt
99c685b0e8 Merge "Bugreport: Fix SystemUI service from being dumped twice 1/2" 2018-10-03 15:35:56 +00:00
Leif Hendrik Wilden
1bceeaac85 Merge "Allow wifi and ethenet connected at same time."
am: 54d34fe8a7

Change-Id: I7c1d6fdcb7c7ed26e765f52373e20d19b6db7bfc
2018-10-02 10:57:11 -07:00
Treehugger Robot
54d34fe8a7 Merge "Allow wifi and ethenet connected at same time." 2018-10-02 17:09:16 +00:00
Vishnu Nair
5ed09e844b Bugreport: Fix SystemUI service from being dumped twice 1/2
Bug: 110490179
Fix: 110490179

Test: Manual test dumpsys activity
  adb shell dumpsys activity service all-platform-non-critical
  adb shell dumpsys activity service all-platform
  adb shell dumpsys activity service
  Take bugreport and check contents

Test: atest FrameworksCoreTests:DumpUtilsTest

Change-Id: I9173d3fa0cc3aaf42e3ab03e7e2892cf4188b13b
Merged-In: I9173d3fa0cc3aaf42e3ab03e7e2892cf4188b13b
(cherry picked from commit c69cd4480e)
2018-10-02 10:10:41 +01:00
Torne (Richard Coles)
00a23953a1 Merge "Check for null socket name in socket_connect_local."
am: 1781dcc1c8

Change-Id: I9cade977c561205e930c0506cabeb72b3c742f99
2018-10-01 10:43:20 -07:00
Leif Hendrik Wilden
fd30663181 Allow wifi and ethenet connected at same time.
This will improve the user experience on Android TV devices,
see bug for details.

In addition when connecting adb to the device by ethernet
for cts, wifi will not connect, causing lots of tests to fail.
For example:
[CTS7.1]android.net.wifi.cts.WifiInfoTest#testWifiInfoProperties
[CTS7.1]android.net.cts.ConnectivityManagerTest#testConnectivityChanged_
manifestRequestOnlyPreN_shouldReceiveIntent

Use command:settings to put global wifi_data_always_on 1 to enable it.

Bug: 26102779
Test: Manual, CTS.
Change-Id: I711d93061a6bc7164d98a858912f781e1b967406
2018-10-01 09:12:10 -07:00
Torne (Richard Coles)
771b187d9b Check for null socket name in socket_connect_local.
socket_bind_local checks if the name is null before using it, but
socket_connect_local doesn't, resulting in a segfault if you pass null
as the socket name. Check for this and convert it to
NullPointerException to make the crash more reasonable.

Test: am instrument -w -e class android.net.LocalSocketTest com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I67dedbe9ca1be6425e047496d0ead92eb7f64691
2018-09-28 11:48:34 -04:00
Yuanjia Hsu
b04fcd5842 Merge "Add feature flag in Settings."
am: 55b91f6d93

Change-Id: I27aa24563358fe4467de3aa3660825f1d8bd73d5
2018-09-17 07:09:28 -07:00
Yuanjia Hsu
55b91f6d93 Merge "Add feature flag in Settings." 2018-09-17 13:43:08 +00:00
Colin Cross
f5c86dc1c1 Remove workarounds for b/79755007
aapt2 now recognizes these manifest elements.

Bug: 79755007
Test: m checkbuild
Change-Id: I2718fc973e08e7f5226b009807312bd534216f8d
2018-09-13 22:25:58 -07:00
Steven Moreland
fc8de0d9e3 Merge changes from topic "remove-hidl-boot-jars"
am: 82e3d2f066

Change-Id: I17b89f904ed17ee8f1f31c6d56cb96da705cb553
2018-09-13 09:40:50 -07:00
Steven Moreland
f36ad62907 pm: Add hidl libraries to old class paths.
These two libraries:
android.hidl.base-V1.0-java
android.hidl.manager-V1.0-java

are being removed from BOOT_JARS. This change facilitates linking to them
for libraries or prebuilts in or before P.

Test: atest android.content.pm.AndroidHidlUpdaterTest
Bug: 77307025

Change-Id: Ic0db24cc68d66f5dbfab126ce7e304eec0bfc969
2018-09-12 09:18:40 -07:00
yuanjiahsu
88363e9b2f Add feature flag in Settings.
User can enable/disable faster emergency phone call feature by switching
this flag from Settings, and the old flag switched by adb command was
replaced by this feature flag.

Test: Manually
Bug: 113539598
Change-Id: Ie38f4657bfd76d8386ce2a075f4ec5d0038f5c3d
2018-09-11 15:04:51 +08:00
Seigo Nonaka
886f1488ea Merge "Disable tests failing with ICU62"
am: cc11cf2ef2

Change-Id: I64229a24eb0c20a81d8c548504d9a97de457c074
2018-09-04 02:41:06 -07:00
Treehugger Robot
cc11cf2ef2 Merge "Disable tests failing with ICU62" 2018-09-04 09:21:26 +00:00
Seigo Nonaka
9a9a878952 Disable tests failing with ICU62
Bug: 111299224
Bug: 113701305
Test: atest android.text.method.ForwardDeleteTest
Merged-In: Ic872c632a68a31c3fee2916d0ff4fce83b76eff6
Change-Id: Ic872c632a68a31c3fee2916d0ff4fce83b76eff6
(cherry picked from commit dd2c429104)
2018-09-03 08:09:59 +00:00
Remi NGUYEN VAN
0f78680ce2 Merge "Add global setting to use new DHCPv4 server"
am: 64dda3cf18

Change-Id: I3476e8e53247d086ca38e18c8713bb17396c6dfd
2018-08-28 23:40:02 -07:00
Remi NGUYEN VAN
64dda3cf18 Merge "Add global setting to use new DHCPv4 server" 2018-08-29 06:24:40 +00:00
Remi NGUYEN VAN
0597453f7c Add global setting to use new DHCPv4 server
The setting applies to the choice of DHCPv4 server for tethering.

Bug: b/109584964
Test: Still builds, SettingsBackupTest passes
Change-Id: Id9b5820883eaf3148f09ad948c34795b3619a30e
2018-08-28 17:47:04 +09:00
CY Cheng
0f7856add6 resolve merge conflicts of e58c780571 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d2feec990c23fb3536fc6b3e19c0b2696b81441
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
Merged-In: I8e6bb72ce7b8cecdb6bd01150b53f61f1515dbb1
Merged-In: Ic08cabc63daebc4001c8eda751857d11cb0e6352
2018-08-16 10:43:49 +00:00
Wesley.CW Wang
74b9579088 Add emergency dialer option on power menu
Add a button on power menu to launch emergency dialer.
Add FASTER_EMERGENCY_PHONE_CALL_ENABLED to SettingsBackupTest blacklist.

Test: Manually
Bug: 80376488
Change-Id: If359662a4d60dbe0ded89c3afe35db91dca4c445
Merged-In: I9c920e31433c0ac23165f917d8dd2befaaa4938d
2018-08-13 11:58:23 +08:00
Josh Gao
1fb65f1798 Merge "MemoryIntArray: track the owned file descriptor in a PFD." am: dccbfca194
am: 873c70a8fd

Change-Id: I2562db3d476face06215e22ecc476c60827ebdd1
2018-08-10 15:46:35 -07:00