OSDN Git Service
yoonjeong Jang [Mon, 28 Oct 2019 05:40:01 +0000 (14:40 +0900)]
Addition of 'XorEqualsString' method for comparing String
Previously, ApnSetting compared two APNs using String with 'XorEqual' method
and the result of it used for 'dedupeApnSettings' for DcTracker.
For instance, a MMS APN for the specific operator shall be merged with
the default(Internet) APN of the same operator's(mccmnc) APN once the result of 'similar' is true.
But recently, it didn't merge two similar APNs properly due to 'UNSPECIFIED_STRING' case.
So we've added XorEquals for String(XorEqualsString) case.
The Issue will happen in the circumstance below.
1.A network operator's similar APNs are saved separately at the APN database(apns-conf.xml)
For instance, Add two APNs like below and check the result of merging APNs at DcTracker.
<apn carrier="SKT LTE INTERNET"
mcc="450"
mnc="05"
apn="lte.sktelecom.com"
type="default,supl,fota,cbs"
protocol="IPV4V6"
/>
<apn carrier="SKT LTE INTERNET"
mcc="450"
mnc="05"
apn="lte.sktelecom.com"
type="mms"
mmsc="http://omms.nate.com:9082/oma_mms"
mmsproxy="smart.nate.com"
mmsport="9093"
protocol="IPV4V6"
/>:q
2. Two similar APNs shall be merged on the result of ApnSetting's 'similar' method.
P => merged
Q => not merged
Test: Manual
Change-Id: I0584310765e246ef16163201282d7db48c44e451
Signed-off-by: yoonjeong Jang <yjeong.jang@samsung.com>
Jack Yu [Sun, 27 Oct 2019 07:20:47 +0000 (07:20 +0000)]
Merge "Change Wi-Fi Calling text for SFR France"
Xin Li [Sun, 27 Oct 2019 04:44:29 +0000 (04:44 +0000)]
Merge "Merge Coral/Flame into AOSP master"
Ian Kasprzak [Sat, 26 Oct 2019 20:07:34 +0000 (20:07 +0000)]
Merge "Ignore FlakyTests in test-mapping."
Marco Nelissen [Sat, 26 Oct 2019 01:45:57 +0000 (01:45 +0000)]
Merge "Move Visualizer to libaudioeffect_jni, its only user"
Ian Kasprzak [Fri, 25 Oct 2019 23:46:06 +0000 (16:46 -0700)]
Ignore FlakyTests in test-mapping.
(Merged-In tag to prevent merging to qt-r1-dev-plus-aosp and downstream)
Test: N/A
Bug:
142395610
Change-Id: Ib7b9aab429b59fa1fcd9638f4733147a17cbd4ef
Merged-In: Ia2345b03d54deef9bd2f5ed67ae9ce2216507b10
Marco Nelissen [Wed, 23 Oct 2019 16:21:55 +0000 (09:21 -0700)]
Move Visualizer to libaudioeffect_jni, its only user
This removes libaudioeffect_jni's dependency on libmedia and removes
libmedia's dependency on libaudioutils.
Test: build
Change-Id: I23902cd1cc16b49200f41f79736683c89b9f86f8
Merged-In: I23902cd1cc16b49200f41f79736683c89b9f86f8
Marco Nelissen [Fri, 25 Oct 2019 19:47:54 +0000 (19:47 +0000)]
Merge "Add required header_libs"
Mathieu Chartier [Fri, 25 Oct 2019 19:35:00 +0000 (19:35 +0000)]
Merge "Avoid preloading classes for boot image profiling"
Chen Xu [Fri, 25 Oct 2019 17:28:22 +0000 (17:28 +0000)]
Merge "move CellBroadcastMessage from telephony-common to app"
Xin Li [Fri, 25 Oct 2019 17:27:58 +0000 (10:27 -0700)]
Merge Coral/Flame into AOSP master
Bug:
141248619
Change-Id: Ic0486c8c79d94c9a30efa37676b2f6a94fb7b5fa
Merged-In: Ibe8ff7bdba7a886bd8b91155ae56f087a836981f
Chen Xu [Fri, 25 Oct 2019 17:27:45 +0000 (17:27 +0000)]
Merge "make CallerInfo as SystemAPI"
Tom Cherry [Fri, 25 Oct 2019 16:53:20 +0000 (16:53 +0000)]
Merge "Remove legacy logger_entry_v* structs"
Howard Chen [Fri, 25 Oct 2019 07:18:57 +0000 (07:18 +0000)]
Merge "Use new GsiInstallParams struct"
Mark Chien [Fri, 25 Oct 2019 06:41:49 +0000 (06:41 +0000)]
Merge "[Tether03] Migrate IpServer into module"
Hai Zhang [Thu, 24 Oct 2019 21:45:53 +0000 (14:45 -0700)]
Merge "Add OWNERS for SettingsProvider."
am:
18bece7b32
Change-Id: Ibe8ff7bdba7a886bd8b91155ae56f087a836981f
Yincheng Zhao [Thu, 24 Oct 2019 21:38:49 +0000 (14:38 -0700)]
Merge "Adding API in TelephonyManger for updating Fplmns."
am:
32eb91717f
Change-Id: I6f1ec15774320b08238c9338ff849b7528c120a6
Mitch Phillips [Thu, 24 Oct 2019 21:35:40 +0000 (14:35 -0700)]
Merge "Make libstatslog static-linkage compatible."
am:
871d5592ff
Change-Id: I35ecaee6dada5341d563f01915286324d07ec7f4
Howard Chen [Tue, 13 Aug 2019 09:01:53 +0000 (17:01 +0800)]
Use new GsiInstallParams struct
Bug:
139402092
Test: adb shell am start-activity \
-n com.android.dynsystem/com.android.dynsystem.VerificationActivity \
-a android.os.image.action.START_INSTALL \
-d file:///storage/emulated/0/Download/system.raw.gz \
--el KEY_SYSTEM_SIZE $(du -b system.raw|cut -f1) \
--el KEY_USERDATA_SIZE
8589934592
Change-Id: I62330ccbe3c863850b545db5e911196d22f518d7
Marco Nelissen [Mon, 21 Oct 2019 21:52:58 +0000 (14:52 -0700)]
Add required header_libs
Test: build
Bug:
143245419
Change-Id: Idff0bf6cde9bc3e568d04c978f388be31963bc02
Hai Zhang [Thu, 24 Oct 2019 21:12:48 +0000 (21:12 +0000)]
Merge "Add OWNERS for SettingsProvider."
Yincheng Zhao [Thu, 24 Oct 2019 20:50:27 +0000 (20:50 +0000)]
Merge "Adding API in TelephonyManger for updating Fplmns."
Mitch Phillips [Thu, 24 Oct 2019 20:38:33 +0000 (20:38 +0000)]
Merge "Make libstatslog static-linkage compatible."
Tom Cherry [Wed, 16 Oct 2019 00:10:15 +0000 (17:10 -0700)]
Remove legacy logger_entry_v* structs
These are obsolete so we move all users to a single format.
Test: build, logging unit tests
Change-Id: I05ebb0b9135c61585ff103d24b785b9f21197257
Hai Zhang [Thu, 24 Oct 2019 17:51:56 +0000 (10:51 -0700)]
Add OWNERS for SettingsProvider.
Test: presubmit
Change-Id: I83862af2283b899a99fb313ba2118da45b2d4a1f
Mathieu Chartier [Thu, 24 Oct 2019 15:09:56 +0000 (08:09 -0700)]
Merge "Fix waiting for system server to be running for BootImageProfileTest"
am:
761ce2abac
Change-Id: I597247d864e5b92d734405c87b59ef3282f80cb9
Mathieu Chartier [Wed, 23 Oct 2019 16:53:39 +0000 (09:53 -0700)]
Avoid preloading classes for boot image profiling
Since the clinits may execute methods, we should avoid preloading
classes to avoid executing methods that may not be required. These
samples could cause inaccuracy in the boot image profile.
Test: manual: adb logcat | grep preloadClasses
Bug:
139883463
Change-Id: I5b4568a477724606105196cba010109f80eecec1
Mathieu Chartier [Thu, 24 Oct 2019 14:41:54 +0000 (14:41 +0000)]
Merge "Fix waiting for system server to be running for BootImageProfileTest"
Mark Chien [Thu, 24 Oct 2019 13:38:24 +0000 (06:38 -0700)]
Merge "[Tether02] Migrate TetheringConfiguration into module"
am:
72d5460dda
Change-Id: I8fa812a78f61976741bc06ccf4000f625b75ecbe
Mark Chien [Thu, 24 Oct 2019 13:34:11 +0000 (06:34 -0700)]
Merge "[Tether01] Add Tethering App"
am:
8c26c38984
Change-Id: I060d5557d8cc01a7503292cccf6c636f3d4660c9
Mark Chien [Thu, 24 Oct 2019 13:10:24 +0000 (13:10 +0000)]
Merge "[Tether02] Migrate TetheringConfiguration into module"
Mark Chien [Thu, 24 Oct 2019 13:10:04 +0000 (13:10 +0000)]
Merge "[Tether01] Add Tethering App"
Anna Trostanetski [Thu, 24 Oct 2019 12:53:50 +0000 (05:53 -0700)]
Merge "Add userId to the package name API."
am:
dcc401b7b7
Change-Id: Ib1b52a3f1082ce6f6d6087080e3e1bc5677f5026
Anna Trostanetski [Thu, 24 Oct 2019 12:38:33 +0000 (12:38 +0000)]
Merge "Add userId to the package name API."
Neil Fuller [Thu, 24 Oct 2019 10:09:07 +0000 (03:09 -0700)]
Merge "Fix docs to be clearer and more maintainable"
am:
7e62a930a1
Change-Id: I9803c6c8dc78bfd2f86d7850368dfb9ad82ebbf6
Neil Fuller [Thu, 24 Oct 2019 09:51:07 +0000 (09:51 +0000)]
Merge "Fix docs to be clearer and more maintainable"
Chiachang Wang [Thu, 24 Oct 2019 07:45:37 +0000 (00:45 -0700)]
Merge "Extend netlink class to fit the data structure"
am:
0825500b27
Change-Id: I8761a413249e5ba95f584e0a89c7acfa388d7f00
Chiachang Wang [Thu, 24 Oct 2019 07:31:53 +0000 (07:31 +0000)]
Merge "Extend netlink class to fit the data structure"
Michele [Thu, 24 Oct 2019 06:24:38 +0000 (23:24 -0700)]
Merge "Removal of usage of hidden APIs"
am:
78b20d0d58
Change-Id: I81d1791744a419b1f0a38559335b83bab3b80512
markchien [Mon, 9 Sep 2019 12:50:49 +0000 (20:50 +0800)]
[Tether03] Migrate IpServer into module
Add IpServer which is used to serve ip configuration, dhcp, dns proxy
and nat for downstream interface.
Bug:
136040414
Test: -build, flash, boot
-atest TetheringTests
-atest FrameworksNetTests
Change-Id: I23652ae0b9509abe7d38da96d523eb22ab00a343
Michele [Thu, 24 Oct 2019 06:20:34 +0000 (23:20 -0700)]
Merge "Replace Rlog with Log in CarrierDefaultApp"
am:
2cbb5a9f2d
Change-Id: I58f3f18f1d701af9c98474660ee1653f06c31ec3
Treehugger Robot [Thu, 24 Oct 2019 06:03:26 +0000 (06:03 +0000)]
Merge "Removal of usage of hidden APIs"
Treehugger Robot [Thu, 24 Oct 2019 06:03:06 +0000 (06:03 +0000)]
Merge "Replace Rlog with Log in CarrierDefaultApp"
markchien [Tue, 3 Sep 2019 07:58:06 +0000 (15:58 +0800)]
[Tether02] Migrate TetheringConfiguration into module
TetheringConfiguration is a utility class to encapsulate the various
configuration elements.
Bug:
136040414
Test: -build, flash, boot
-atest TetheringTests
Change-Id: I9434ab213bc5e0fca59f14a6c8cea554abefc3a4
markchien [Tue, 27 Aug 2019 02:19:38 +0000 (10:19 +0800)]
[Tether01] Add Tethering App
This is initial patch that don't contain any service for now.
Bug:
136040414
Test: -build, flash, boot
Change-Id: I0b49d7e9c3fcba5af3025163f9cc9eafb0778116
Sarah Chin [Thu, 24 Oct 2019 05:17:20 +0000 (22:17 -0700)]
Merge "Update SMS list"
am:
0aa93fca29
Change-Id: I6fde6c7b7cc04a236dded33d09afed83f89e197f
Treehugger Robot [Thu, 24 Oct 2019 04:57:36 +0000 (04:57 +0000)]
Merge "Update SMS list"
Michele [Wed, 4 Sep 2019 20:52:31 +0000 (13:52 -0700)]
Removal of usage of hidden APIs
Moved RESOLUTION_ACTIONS from EuiccService to EuiccResolutionUiDispatcherActivity,
so that it does not need to be made public.
Bug:
137202333
Test: compilation
Change-Id: If8011bbe6af32c038f55d851acc2406eba208de6
Merged-In: If8011bbe6af32c038f55d851acc2406eba208de6
Michele [Mon, 14 Oct 2019 21:56:56 +0000 (14:56 -0700)]
Replace Rlog with Log in CarrierDefaultApp
Bug:
140580260
Test: compilation
Change-Id: Ib7ba43701b1a22ada0d8f5954c57b96bfa9f0489
Merged-In: Ib7ba43701b1a22ada0d8f5954c57b96bfa9f0489
Myles Watson [Wed, 23 Oct 2019 22:52:31 +0000 (15:52 -0700)]
Merge "Bluetooth doc: The is a -> This is a"
am:
c8d3cde31e
Change-Id: Ibd5c32da0420d3b32f43bb3f14453d08e231ffa5
Treehugger Robot [Wed, 23 Oct 2019 22:32:54 +0000 (22:32 +0000)]
Merge "Bluetooth doc: The is a -> This is a"
Sarah Chin [Wed, 23 Oct 2019 22:25:42 +0000 (15:25 -0700)]
Update SMS list
Bug:
143238928
Test: none
Change-Id: Ia700a0dc507e2a58b9c9e1d7890f90cdb30f0af6
Mathieu Chartier [Wed, 23 Oct 2019 21:04:29 +0000 (14:04 -0700)]
Fix waiting for system server to be running for BootImageProfileTest
In the case where system server was not yet running, the invalid pid
would cause the test to fail instead of doing the 20 retry loop.
Fixed the logic to handle this case.
Presumably fixes test flakyness.
Bug:
143223380
Bug:
139883463
Test: atest ./tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java
Change-Id: I4bac03e7f377058479f75daaa0d57608614bf329
Myles Watson [Fri, 11 Oct 2019 22:49:37 +0000 (15:49 -0700)]
Bluetooth doc: The is a -> This is a
Fixes:
142364826
Test: build
Change-Id: I9bde35140bdfc4d76df7e8c427ac6e8baceee611
TreeHugger Robot [Wed, 23 Oct 2019 17:15:26 +0000 (17:15 +0000)]
Merge "Use language tags to store Configuration's locale list." into stage-aosp-master
Jean-Michel Trivi [Wed, 23 Oct 2019 16:57:49 +0000 (09:57 -0700)]
Merge "AudioService: handle errors when reconnecting mixes after server crash"
am:
0ac7e561e9
Change-Id: Iceadb2d9f5415ddc004cea99e2ae9c3800e1734b
Marco Nelissen [Wed, 23 Oct 2019 16:48:02 +0000 (09:48 -0700)]
Merge "Move MidiDeviceInfo to libamidi, its only user"
am:
7a2fb04c22
Change-Id: I1324481ce65836ac8fc2b53520b3cd368631bbc3
Treehugger Robot [Wed, 23 Oct 2019 16:40:09 +0000 (16:40 +0000)]
Merge "AudioService: handle errors when reconnecting mixes after server crash"
Marco Nelissen [Wed, 23 Oct 2019 16:28:37 +0000 (16:28 +0000)]
Merge "Move MidiDeviceInfo to libamidi, its only user"
Jean-Michel Trivi [Tue, 22 Oct 2019 15:59:36 +0000 (08:59 -0700)]
AudioService: handle errors when reconnecting mixes after server crash
Log errors when reconnecting dynamic policy mixes after an audio
server crash.
Add IntDef for AudioSystem errors, and conversion to String.
Add support for notifying an AudioPolicy user that it was
unregistered.
Bug:
133279309
Test: connect DAP, kill audio server, verify no errors reported
Change-Id: I1dbfdac1873ed9c44c20ca9d25bbe01ce9904ee5
Merged-In: I1dbfdac1873ed9c44c20ca9d25bbe01ce9904ee5
Marco Nelissen [Tue, 22 Oct 2019 20:44:43 +0000 (13:44 -0700)]
Move MidiDeviceInfo to libamidi, its only user
This removes the libmedia dependency from libamidi, and reduces
overall size.
Test: build
Change-Id: I16b62ef8288bc68a46ae9ac6318efb95fa469e4f
Merged-In: I16b62ef8288bc68a46ae9ac6318efb95fa469e4f
Chiachang Wang [Thu, 17 Oct 2019 02:51:40 +0000 (11:51 +0900)]
Extend netlink class to fit the data structure
In order to get the tcp_info via netlink socket from kernel,
NetworkStack needs to use netlink class to pack and parse the
InetDiagReq. Current design hardcodes ididag_ext field in
InetDiagReqV2. The structure is also not allowed to take null
id to not to specify certain socket. Update the constructor and
backward support exising constructor.
Bug:
136162280
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Id66da1797da183ae3d99073f80bad1df929946dc
Lucas Lin [Wed, 23 Oct 2019 09:51:56 +0000 (02:51 -0700)]
Merge "Better notification to user when DNS-over-TLS is broken"
am:
81852c8481
Change-Id: I8be963e35ed5e5ba914c6d3504a52ccb789aaf29
Lucas Lin [Wed, 23 Oct 2019 09:20:09 +0000 (09:20 +0000)]
Merge "Better notification to user when DNS-over-TLS is broken"
Hall Liu [Tue, 22 Oct 2019 23:21:17 +0000 (16:21 -0700)]
Merge "Add logging values for new call states"
am:
e87b7156c9
Change-Id: I142b6cf55c56063e1c9a031771dd354b9cd6d3be
Hall Liu [Tue, 22 Oct 2019 23:10:58 +0000 (23:10 +0000)]
Merge "Add logging values for new call states"
Varun Shah [Tue, 10 Sep 2019 18:41:00 +0000 (14:41 -0400)]
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
5e67462971695e302d0ac9ffc4158d8e08385592)
Anna Trostanetski [Tue, 22 Oct 2019 20:20:59 +0000 (13:20 -0700)]
Merge "Add a native aidl API."
am:
577e3114da
Change-Id: I22c7963991747fe1e27dce432da3fc02c644bbef
atrost [Tue, 22 Oct 2019 18:44:09 +0000 (19:44 +0100)]
Add userId to the package name API.
The service would query package manager with the provided userId, and
will return true if the package is not visible.
Test: locally, b/
143129258
Change-Id: Iab8ddaa76358d5fad63e10d7c4c3f92e2a0f51a2
Merged-In: I92ea650b49743c388bff9943a7ec620e3d61a5d6
Anna Trostanetski [Tue, 22 Oct 2019 20:06:19 +0000 (20:06 +0000)]
Merge "Add a native aidl API."
atrost [Thu, 10 Oct 2019 18:27:31 +0000 (19:27 +0100)]
Add a native aidl API.
Introduce a platform_compat_native service that just calls the
platform_compat service.
The new service is needed as it needs a slightly different (more
limited, no ApplicationInfo in cpp) aidl API, and a class can only
extend one stub.
Test: Call the service from dumpsys.cpp (http://aosp/
1142055)
Bug:
138275545
Change-Id: Ic46cc34b4c1dd4ebc6bcc996fb3f8503607214ac
Merged-In: Ic46cc34b4c1dd4ebc6bcc996fb3f8503607214ac
lucaslin [Tue, 22 Oct 2019 10:27:33 +0000 (18:27 +0800)]
Better notification to user when DNS-over-TLS is broken
Provide a specifc notification to let users know that device
has no internet is because it really doesn't have internet access
or it's caused by private DNS resolution failed.
Bug:
113242081
Test: atest FrameworksNetTests
Change-Id: I710c88a4742f5fd56c39fc797d7fa3ad36dba553
Chen Xu [Sun, 8 Sep 2019 01:56:17 +0000 (18:56 -0700)]
make CallerInfo as SystemAPI
1. move CallerInfo from telephony.internal to andorid.telephony package
2. expose APIs inside CallerInfo which are consumed by non-telephony
code.
Bug:
140908357
Test: Build
Change-Id: Ie95897c77e97e40f5357c107aede82edfea44d5a
(cherry picked from commit
b9a1eefec66e8c2cd5ab9dab512bb729ef2caae8)
Merged-in: Ie95897c77e97e40f5357c107aede82edfea44d5a
Mathieu Chartier [Mon, 21 Oct 2019 23:50:11 +0000 (16:50 -0700)]
Merge "Use phenotype properties for boot image profile test"
am:
90dfd6b009
Change-Id: I6044413eebc96a7bc7d10ba98a30c540011a036a
Mathieu Chartier [Mon, 21 Oct 2019 23:23:49 +0000 (23:23 +0000)]
Merge "Use phenotype properties for boot image profile test"
Mitch Phillips [Mon, 21 Oct 2019 20:32:14 +0000 (13:32 -0700)]
Make libstatslog static-linkage compatible.
libstatslog is a blocker for some fuzzing. Our continuous fuzzing
infrastructure requires a statically-linked binary, and things depend on
libstatslog down the chain. We should allow libstatslog to be linked
statically.
Bug: N/A
Test: m libstatslog
Change-Id: Ic742a90daf6cbb5d197784416626256bfb6182b7
Shuo Qian [Mon, 21 Oct 2019 20:22:50 +0000 (13:22 -0700)]
Merge "Emergency number database config updater"
am:
ca0f14ec1a
Change-Id: Ice41292677b52fe62fa860960fe62a29e28068dc
Yincheng Zhao [Mon, 21 Oct 2019 20:21:30 +0000 (13:21 -0700)]
Merge "Changed regex matching for MCC and MNC"
am:
5ffb4ad657
Change-Id: I64b9c2bb033f6469a837689ebc603be5be5aff75
Shuo Qian [Mon, 21 Oct 2019 19:59:39 +0000 (19:59 +0000)]
Merge "Emergency number database config updater"
Yincheng Zhao [Mon, 21 Oct 2019 19:42:47 +0000 (19:42 +0000)]
Merge "Changed regex matching for MCC and MNC"
Neil Fuller [Mon, 21 Oct 2019 18:53:20 +0000 (11:53 -0700)]
Merge "Make TimeDetectorService more aware of origin"
am:
4ef2551dfa
Change-Id: I27866cf74b779bb0040f4ace384207047ca6838f
Neil Fuller [Mon, 21 Oct 2019 18:33:31 +0000 (18:33 +0000)]
Merge "Make TimeDetectorService more aware of origin"
atrost [Mon, 21 Oct 2019 18:17:41 +0000 (11:17 -0700)]
Merge "Get ApplicationInfo using self UID to make sure we have permission."
am:
217e42aa7d
Change-Id: Ic8b0829c5b1669f78c9251a125394ee935685667
Treehugger Robot [Mon, 21 Oct 2019 17:22:34 +0000 (17:22 +0000)]
Merge "Get ApplicationInfo using self UID to make sure we have permission."
atrost [Mon, 21 Oct 2019 16:10:39 +0000 (17:10 +0100)]
Get ApplicationInfo using self UID to make sure we have permission.
Otherwise the caller is checked for permission to get the
ApplicationInfo, and may be denied due to lack of INTERACT_ACROSS_USERS.
Bug:
142942524
Test: patched to internal master,
1. Install TestDPC via adb
2. Invoke "Set up Te..." from the launcher to create a work profile and follow "next" button and select "skip adding an account"
3. Select TestDPC from the "work" tab of the list of all apps in launcher.
4. Using built-in search look for "Password constraints" and tap it.
5. tap "Minimum password length" and try to set it to 5.
Before change: Neither user
1010193 nor current process has android.permission.INTERACT_ACROSS_USERS.
After Change: password quality should be at least 131072 for setPasswordMinimumLength
Change-Id: I4018fac21c1ce40f4258be0dc39ebe0e8e1bd582
Edward Savage-Jones [Mon, 21 Oct 2019 15:57:02 +0000 (08:57 -0700)]
Merge "translate="false" -> translatable="false""
am:
dd87b30266
Change-Id: Ie1ea3ee801339639c131e5cb89b3024d13c4b24c
Treehugger Robot [Mon, 21 Oct 2019 15:39:53 +0000 (15:39 +0000)]
Merge "translate="false" -> translatable="false""
Anna Trostanetski [Mon, 21 Oct 2019 12:20:09 +0000 (05:20 -0700)]
Merge "Add a unit test for ChangeReporter."
am:
7b5773765f
Change-Id: I4af55d71ed16a1e4702ed02a5751105f33327cbb
Anna Trostanetski [Mon, 21 Oct 2019 10:31:21 +0000 (10:31 +0000)]
Merge "Add a unit test for ChangeReporter."
Jerome Gaillard [Mon, 21 Oct 2019 09:49:49 +0000 (02:49 -0700)]
Merge "Use Metalava to get SDK metadata for devtools"
am:
a56124379c
Change-Id: I59277a64511759946e46cf98cea04db590301366
Jerome Gaillard [Mon, 21 Oct 2019 09:32:12 +0000 (09:32 +0000)]
Merge "Use Metalava to get SDK metadata for devtools"
Neil Fuller [Tue, 15 Oct 2019 13:37:37 +0000 (14:37 +0100)]
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
Chen Xu [Sun, 20 Oct 2019 05:25:21 +0000 (22:25 -0700)]
Merge "Cellbroadcast util lib"
am:
80e531234f
Change-Id: I0f410dbc0f0df09dbe3aa1a8fe88f68b6a8e2ca9
Chen Xu [Sun, 20 Oct 2019 05:16:38 +0000 (05:16 +0000)]
Merge "Cellbroadcast util lib"
Chen Xu [Wed, 9 Oct 2019 01:39:03 +0000 (18:39 -0700)]
Cellbroadcast util lib
Bug:
135956699
Test: Build
Change-Id: I247bfb3d877334fe822332275e37f015e10a566e
(cherry picked from commit
4fea79cc583a16804f4d596daa61fe7025d4f5e5)
Merged-in: I247bfb3d877334fe822332275e37f015e10a566e
Chen Xu [Thu, 3 Oct 2019 23:48:56 +0000 (16:48 -0700)]
move CellBroadcastMessage from telephony-common to app
1. add slotIndex in SmsCbMesage
2. move cellbroadcastMessage from telephony-common to app
next step, considering merging CellBroadcast to SmsCbMessage
Bug:
135956699
Bug:
141962867
Test: build & unit test
Change-Id: I07604101e3dccaa8e1539fa2644ef08da54d4533
(cherry picked from commit
515285b1b515330f7795ba6a9c361a56a04ab172)
Merged-in: I07604101e3dccaa8e1539fa2644ef08da54d4533
Martin Stjernholm [Sat, 19 Oct 2019 12:38:36 +0000 (05:38 -0700)]
Merge "Remove unnecessary dependencies on ART internal libraries."
am:
30b3905091
Change-Id: I41e9126d946bd347096fe8dce4887e9a2c67fe95
Treehugger Robot [Sat, 19 Oct 2019 12:20:47 +0000 (12:20 +0000)]
Merge "Remove unnecessary dependencies on ART internal libraries."
Sarah Chin [Sat, 19 Oct 2019 01:29:03 +0000 (18:29 -0700)]
Merge "Add sarahchin to OWNERS"
am:
edadd4e303
Change-Id: I12fcd781342dec2fb801704a73dcdfa485a37953
Treehugger Robot [Sat, 19 Oct 2019 01:16:06 +0000 (01:16 +0000)]
Merge "Add sarahchin to OWNERS"