OSDN Git Service
Andreas Gampe [Wed, 28 Mar 2018 04:11:57 +0000 (04:11 +0000)]
Merge "BgDexopt: Reschedule job on timeout"
am:
45bd60b4e2
Change-Id: Ibe4e54f2f3ab0a7b1db3396cb1928a16b084f262
Andreas Gampe [Wed, 28 Mar 2018 02:53:57 +0000 (02:53 +0000)]
Merge "BgDexopt: Reschedule job on timeout"
Hansong Zhang [Wed, 28 Mar 2018 01:20:03 +0000 (01:20 +0000)]
Merge changes I70eafe03,Ia44e16c5
am:
b52f49153c
Change-Id: I58da92a4ad77166f68a0aaec6f3fcc4ceeefc3f9
Benedict Wong [Wed, 28 Mar 2018 01:15:22 +0000 (01:15 +0000)]
Merge "Add documentation for TCP interactions with transforms"
am:
b454937f06
Change-Id: I2733218b5b3489902f80b694a1dd6b0d4c1198da
Eric Schwarzenbach [Tue, 27 Mar 2018 23:02:53 +0000 (23:02 +0000)]
Merge "Add constants for reporting criteria"
am:
a36ada4b95
Change-Id: Ib928d0de3e7e33a5efec3b5d5fe6e99f2782058d
Treehugger Robot [Tue, 27 Mar 2018 22:45:18 +0000 (22:45 +0000)]
Merge changes I70eafe03,Ia44e16c5
* changes:
Hearing Aid Profile: set and get activeDevice
Move the setActiveDevice logic from Settings to SettingsLib (1/2)
Benedict Wong [Tue, 27 Mar 2018 22:19:37 +0000 (22:19 +0000)]
Merge "Add documentation for TCP interactions with transforms"
Mathew Inwood [Tue, 27 Mar 2018 22:05:14 +0000 (22:05 +0000)]
Merge "Configurable hidden API exemptions."
am:
4b8285b907
Change-Id: Ia61896bdedff170d75715094ce87b97dc96994ed
Andreas Gampe [Tue, 27 Mar 2018 22:04:19 +0000 (15:04 -0700)]
BgDexopt: Reschedule job on timeout
When the background dexopt job times out, tell the scheduler to
reschedule it, as we have more work to do.
Bug:
76425903
Test: m
Test: manual
Change-Id: Ibbdb979bceb1ff0a25f8aed2b3cc26a7f30057e2
Eric Schwarzenbach [Tue, 27 Mar 2018 20:59:20 +0000 (20:59 +0000)]
Merge "Add constants for reporting criteria"
Treehugger Robot [Tue, 27 Mar 2018 20:49:45 +0000 (20:49 +0000)]
Merge "Configurable hidden API exemptions."
Myles Watson [Tue, 27 Mar 2018 19:56:36 +0000 (19:56 +0000)]
Merge "Tell the user to toggle Bluetooth when enabling HCI logs"
am:
5b36567b76
Change-Id: Ia4a564d9117915103a96a0ce0894b35cae0ff730
Treehugger Robot [Tue, 27 Mar 2018 18:30:12 +0000 (18:30 +0000)]
Merge "Tell the user to toggle Bluetooth when enabling HCI logs"
Myles Watson [Mon, 26 Mar 2018 21:28:46 +0000 (14:28 -0700)]
Tell the user to toggle Bluetooth when enabling HCI logs
Bug:
67634644
Test: Manually inspect the new text in developer settings
Change-Id: Ic8b08c8d6d0c7727a03a265fb6b10a3c55fd96cb
Andreas Gampe [Tue, 27 Mar 2018 17:23:58 +0000 (10:23 -0700)]
Fix merge commit
Follow-up to commit
a2640b6f5142697162d4f02b4134e78b268f4a4b
Test: mmma frameworks/base/tests/net
Change-Id: I5cdc873f6d0d0c39c8e0b38cd04c16fd16a47cbf
Alexandru-Andrei Rotaru [Mon, 26 Jun 2017 16:31:35 +0000 (17:31 +0100)]
Reapply "Notify the user and turn off tethering when the service is disallowed."
Added UserRestrinctionListener for turning the service off one the
DISALLOW_CONFIG_TETHERING is on into Tethering. Added notification about
tethering being turned off. Also added Unit Tests to test the functionality
of the UserRestrictionListener added.
(cherry picked from commit
f8f3fbbd016d12f80c02e136ab4684da807792a1)
Bug:
27936525
Test: Turn the tehering service on (either wifi, usb or bluetooth).
Automatically the system should send a notification about the service
being active.Close settings from recents. From TestDPC User Restrictions
switch on DISALLOW_CONFIG_TETHERING. The tethering should be turned off
and a notification should appear informing that the service is inactive.
Merged-In: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
Change-Id: I500e51fb44a93e943f8566b544e7ad4983ac6a6e
Remi NGUYEN VAN [Tue, 27 Mar 2018 14:02:18 +0000 (23:02 +0900)]
resolve merge conflicts of
f8b537d7a3343f178952c2b05a76c4f58c63a9a1 to stage-aosp-master
Test: TODO
Change-Id: I7959d7812f8db31de689154f37b92497a992fb6c
Remi NGUYEN VAN [Tue, 27 Mar 2018 10:17:44 +0000 (10:17 +0000)]
Merge "Add tests for IPv4 of dual stack tethering."
Mathew Inwood [Fri, 16 Mar 2018 14:26:08 +0000 (14:26 +0000)]
Configurable hidden API exemptions.
Extend the existing hidden_api_blacklist_exemptions config to support a
list of API signature prefixes to exclude from hidden API enforcement.
Push this list down to the zygote process when that process is created,
and when the list changes. This minimizes overhead, but should also ensure
that all new processes get the latest whitelist.
Test: $ adb shell settings put global hidden_api_blacklist_exemptions \
Test: Landroid/view/RemoteAnimationDefinition\\\;:Landroid/app/ActivityManager\\\$TaskDescription\\\;
Test: Manually verify logcat output from app which uses named APIs
Bug:
73337509
Change-Id: Ib1245b69da4dac50c6968f1be62f1a74591dc433
Ruchi Kandoi [Tue, 27 Mar 2018 06:03:08 +0000 (06:03 +0000)]
Merge "Modify Open Mobile API to follow Android API guidelines"
am:
ee63876ed4
Change-Id: I29c43bcdccb3ba263c0a6a7e106c3c9180910c75
Treehugger Robot [Tue, 27 Mar 2018 04:40:40 +0000 (04:40 +0000)]
Merge "Modify Open Mobile API to follow Android API guidelines"
Hall Liu [Tue, 27 Mar 2018 01:10:16 +0000 (01:10 +0000)]
Merge "Split the DownloadStateCallback class into two"
am:
aa8f09d41a
Change-Id: Id31521d2a138a0a3ef98ea5a56d19621c757dc90
Treehugger Robot [Mon, 26 Mar 2018 23:53:40 +0000 (23:53 +0000)]
Merge "Split the DownloadStateCallback class into two"
Ruchi Kandoi [Thu, 22 Mar 2018 18:06:36 +0000 (11:06 -0700)]
Modify Open Mobile API to follow Android API guidelines
- Add @Nullable/@NonNull to input arguments for APIs
- Remove deprecated methods openBasicChannel(aid) and
openLogicalChannel(aid)
- SecureElementListener is converted to a stand-alone interface
- serviceConnected() callback is renamed to onServiceConnected()
Bug:
64994044
Test: Run Cts Test
Change-Id: I503044a26a81dae8befb87fb8e8ac96d19de883b
Tyler Gunn [Mon, 26 Mar 2018 22:25:35 +0000 (22:25 +0000)]
Merge "Add exception catching for BlockedNumberContract methods used by Telecom."
am:
13791285aa
Change-Id: I91280ca5ce1a146ca0635f95fb2b0d9a311778ea
Hall Liu [Tue, 20 Mar 2018 01:12:23 +0000 (18:12 -0700)]
Split the DownloadStateCallback class into two
Use individually-registered DownloadStatusListener and
DownloadProgressListener instead to listen for download status and
progress, respectively.
Bug:
74409377
Test: cts
Change-Id: Ifd5289038ffd66eef8bd7916f5256205b49be5f9
Merged-In: Ifd5289038ffd66eef8bd7916f5256205b49be5f9
Tyler Gunn [Mon, 26 Mar 2018 21:18:54 +0000 (21:18 +0000)]
Merge "Add exception catching for BlockedNumberContract methods used by Telecom."
Martijn Coenen [Mon, 26 Mar 2018 20:26:18 +0000 (20:26 +0000)]
Merge "Add new trace tag for AIDL."
am:
fe3877f140
Change-Id: I7aced8041cb8859b0a26db157e7626045e17a006
Martijn Coenen [Mon, 26 Mar 2018 19:00:57 +0000 (19:00 +0000)]
Merge "Add new trace tag for AIDL."
Benedict Wong [Thu, 15 Mar 2018 02:01:14 +0000 (19:01 -0700)]
Add documentation for TCP interactions with transforms
Updates API documentation to mention that TCP sockets where transforms
are deactivated will not send FIN packets.
Bug:
74851550
Test: API updates only
Change-Id: I8169f221c8c747538a8bddfbf02dcc73c9337189
yuemingw [Mon, 26 Mar 2018 17:56:19 +0000 (17:56 +0000)]
Merge "Better javadoc and rename several methods in ApnSetting."
am:
5d9544cbea
Change-Id: I0f3ebf286462641d2c86ebffd49d95ce30056662
Treehugger Robot [Mon, 26 Mar 2018 16:28:58 +0000 (16:28 +0000)]
Merge "Better javadoc and rename several methods in ApnSetting."
yuemingw [Wed, 21 Mar 2018 15:20:43 +0000 (15:20 +0000)]
Better javadoc and rename several methods in ApnSetting.
Cherrypicked from ag/
3709855.
Test: Manually by TestDpc
Bug:
73087996
Merged-In: I5232c92a44ab505946956f81965a205f170aa52b
Martijn Coenen [Fri, 9 Mar 2018 08:26:54 +0000 (09:26 +0100)]
Add new trace tag for AIDL.
So we can auto-generate tracing code for AIDL interfaces.
Bug:
74416314
Test: inspect atrace output
Change-Id: I42eee24358763305d6b4e954087f3331ad20f9b7
Merged-In: I42eee24358763305d6b4e954087f3331ad20f9b7
Remi NGUYEN VAN [Thu, 15 Mar 2018 02:57:14 +0000 (11:57 +0900)]
Add tests for IPv4 of dual stack tethering.
Also refactoring some Tethering and TetherInterfaceStateMachine calls
to address testability issues.
This is in preparation of other work to have IPv6-only or 464xlat
tethering working.
Test: runtest frameworks-net
Bug:
38218697
Bug:
64382985
Bug:
64976379
Bug:
64995262
Change-Id: I721aca4789ddfbee5a97316aae0b378d79ee2107
Erik Kline [Sat, 24 Mar 2018 01:07:10 +0000 (01:07 +0000)]
Merge "Pass all relevant resolver info to netd"
am:
76f64641bb
Change-Id: If4f46b030fe141a6904a48966e5ab34ffb6b10bc
Treehugger Robot [Fri, 23 Mar 2018 23:41:11 +0000 (23:41 +0000)]
Merge "Pass all relevant resolver info to netd"
Eric Schwarzenbach [Fri, 23 Mar 2018 22:13:57 +0000 (22:13 +0000)]
Merge "Change null behavior of getCellBandwidths"
am:
d3e1c76a99
Change-Id: I23033f776c9901872d786eced64fdc92e3024bca
Tyler Gunn [Fri, 23 Mar 2018 17:16:15 +0000 (10:16 -0700)]
Add exception catching for BlockedNumberContract methods used by Telecom.
The content resolver can throw in some instances when using the blocked
number provider. Rather than crashing all of telecom, adding exception
handling to provide graceful fallback in these cases.
Test: Compile / build
Bug:
74965829
Change-Id: I2e1accce3ed6fac4ec2b8e6a92585abf630b84fe
Elliott Hughes [Fri, 23 Mar 2018 21:12:13 +0000 (21:12 +0000)]
Merge "Use ABI_STRING."
am:
ca7ce49ecc
Change-Id: I4be742799d7b160f802a27498e00c14896306fb4
Treehugger Robot [Fri, 23 Mar 2018 21:06:45 +0000 (21:06 +0000)]
Merge "Change null behavior of getCellBandwidths"
Elliott Hughes [Fri, 23 Mar 2018 19:59:34 +0000 (19:59 +0000)]
Merge "Prune files from /data/anr/ by number as well as age."
am:
6941fcd88c
Change-Id: Ic0c9601520dc0c4a515f5cbffc4dd33cc35ae0c4
Elliott Hughes [Fri, 23 Mar 2018 19:51:59 +0000 (19:51 +0000)]
Merge "Use ABI_STRING."
Hansong Zhang [Fri, 16 Mar 2018 16:15:48 +0000 (09:15 -0700)]
Hearing Aid Profile: set and get activeDevice
Add setActiveDevice() for Hearing Aid Profile in SettingsLib
Bug:
69623109
Test: robolectric test and manual test
Change-Id: I70eafe030747053876e2ab8a125d5dd01c5e0eb9
Merged-In: I70eafe030747053876e2ab8a125d5dd01c5e0eb9
(cherry picked from commit
d7b359165968199e034bd46ca97526dbf719602d)
Hansong Zhang [Tue, 20 Mar 2018 01:20:38 +0000 (18:20 -0700)]
Move the setActiveDevice logic from Settings to SettingsLib (1/2)
Currently the Settings app handles the logic of setting active device;
however, this should be handled by SettingsLib so the logic can be shared.
Bug:
75984255
Test: robolectric test
Change-Id: Ia44e16c550d5b57c985e29e46e17044a895b495a
Merged-In: Ia44e16c550d5b57c985e29e46e17044a895b495a
(cherry picked from commit
6a416327e5b52d6bb78202bd05a86ab84cf2304e)
Eric Schwarzenbach [Thu, 22 Mar 2018 20:49:25 +0000 (13:49 -0700)]
Change null behavior of getCellBandwidths
Returns empty array instead of null when there are
no cell bandwidths.
Bug:
73751023
Test: make, runtest
Change-Id: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
Merged-In: Idc3f034bbea8f6c3f11dcd125f760b121d2c91d9
(cherry picked from commit
c119a863501cc21bfe4853ad46987a2021041e2b)
Tej Singh [Fri, 23 Mar 2018 18:57:43 +0000 (18:57 +0000)]
Merge "Revert "Revert "Logging: Bluetooth Enabled"""
am:
827a150646
Change-Id: I38a7a8e0124b14d394db96b61d2ac6ceacf4bdb9
Elliott Hughes [Fri, 23 Mar 2018 18:27:04 +0000 (11:27 -0700)]
Use ABI_STRING.
Bug: N/A
Test: builds
Change-Id: I5a9d2a6604887f1f0e9583086e012a086042b7df
Eric Schwarzenbach [Wed, 14 Feb 2018 01:45:27 +0000 (17:45 -0800)]
Add constants for reporting criteria
Adds RILConstants and TelephonyManager constants for reporting and
setting indication filter bits.
Bug:
72117365
Test: make
Change-Id: Ia52ffdbc9ea2499893ece518aba4a99c6fe4ee90
Elliott Hughes [Fri, 23 Mar 2018 17:36:23 +0000 (17:36 +0000)]
Merge "Prune files from /data/anr/ by number as well as age."
Treehugger Robot [Fri, 23 Mar 2018 17:29:36 +0000 (17:29 +0000)]
Merge "Revert "Revert "Logging: Bluetooth Enabled"""
Mathew Inwood [Fri, 23 Mar 2018 15:02:12 +0000 (15:02 +0000)]
Merge "More flexible API enforcement policy."
am:
69e1cbc3fe
Change-Id: I8b54dcbca3991b2b076e0648e3948c80d74351d3
Mathew Inwood [Fri, 23 Mar 2018 13:29:03 +0000 (13:29 +0000)]
Merge "More flexible API enforcement policy."
David Srbecky [Fri, 23 Mar 2018 12:10:41 +0000 (12:10 +0000)]
Merge "Fix mini-debug-info generation for apps with wrap.sh script."
am:
5c3521d54f
Change-Id: I22f7893925d2d774cc3e3f10287fb54ae1acf0e1
Mathew Inwood [Fri, 23 Mar 2018 10:05:01 +0000 (10:05 +0000)]
More flexible API enforcement policy.
This CL adds the basics to set black, dark gray or light gray list
enforcement, rather than just black as before. It's not possible to
actually set the policy per-package yet.
PackageDexOptimizer still uses a single bit, for API checks on/off, rather
than the new enum. It assumes blacklist enforcement internally. This can
be improved in a follow up CL.
(cherry-picked from commit
e52130ae4cf3b046b38a09fc7cc7712f5b7fb83d)
Test: m
Test: Boot device
BUG:
73337509
Change-Id: Ic0d5b8fa631c2bd583b6fc52b2ee3708c8113f59
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
David Srbecky [Fri, 23 Mar 2018 10:50:32 +0000 (10:50 +0000)]
Merge "Fix mini-debug-info generation for apps with wrap.sh script."
Shuhei Miyazaki [Fri, 23 Mar 2018 10:32:54 +0000 (10:32 +0000)]
Merge "audioservice: Add a property for default voice call volume"
am:
9d9782ec7e
Change-Id: I1830205ecc1a7e7198be1f01095b9043a95af79f
Chalard Jean [Fri, 23 Mar 2018 09:22:36 +0000 (09:22 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes."
am:
b16a6053fe
Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e
Treehugger Robot [Fri, 23 Mar 2018 08:38:21 +0000 (08:38 +0000)]
Merge "audioservice: Add a property for default voice call volume"
Chalard Jean [Fri, 23 Mar 2018 08:12:51 +0000 (08:12 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks"
am:
06f0fc04e7
Change-Id: Ic05e362af58d667b5be84c3bd421c9250927abe2
Chalard Jean [Fri, 23 Mar 2018 07:33:02 +0000 (07:33 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes."
Erik Kline [Sun, 4 Mar 2018 12:01:01 +0000 (21:01 +0900)]
Pass all relevant resolver info to netd
Test: runtest frameworks-net passes
Test: manual testing of opportunistic and strict mode works
Bug:
34953048
Bug:
64133961
Bug:
72345192
Change-Id: Ia4f1905e1fa60e7a468c2246fb809191d2ba796b
Chalard Jean [Fri, 23 Mar 2018 06:15:00 +0000 (06:15 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks"
Chen Xu [Fri, 23 Mar 2018 05:59:05 +0000 (05:59 +0000)]
Merge "new WFC registration failure notification string"
am:
8bcb7aa971
Change-Id: I7784e82e4b788597ba9c35da7175b485230ab227
Jordan Liu [Fri, 23 Mar 2018 05:04:15 +0000 (05:04 +0000)]
Merge "Add multisim notifications for SST"
am:
1a6228e595
Change-Id: I2fc3c9195da6bf47d6dcaca26d793e956619ccfa
Chen Xu [Fri, 23 Mar 2018 04:00:25 +0000 (04:00 +0000)]
Merge "new WFC registration failure notification string"
Remi NGUYEN VAN [Fri, 23 Mar 2018 03:54:13 +0000 (03:54 +0000)]
Merge "Add method to NetworkStatsService for UID stats."
am:
db89ca3c12
Change-Id: I2c6cba3ebbc8c23ade754cfd411ac54a561b020a
Treehugger Robot [Fri, 23 Mar 2018 03:47:48 +0000 (03:47 +0000)]
Merge "Add multisim notifications for SST"
Remi NGUYEN VAN [Fri, 23 Mar 2018 02:39:00 +0000 (02:39 +0000)]
Merge "Add method to NetworkStatsService for UID stats."
Jack Yu [Fri, 23 Mar 2018 02:25:24 +0000 (02:25 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects."
am:
dd6764a522
Change-Id: I0398c058a35fd644aa949375a53719ba85572408
Treehugger Robot [Fri, 23 Mar 2018 00:59:13 +0000 (00:59 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects."
fionaxu [Thu, 22 Mar 2018 23:37:54 +0000 (16:37 -0700)]
new WFC registration failure notification string
Bug:
37579327
Test: Manual
Change-Id: I5adaf643b2b2c86cac28dabb944765d0a8bcefd0
(cherry picked from commit
6ac589ae665b2190a762d71948de6f41922352d6)
Merged-in: I5adaf643b2b2c86cac28dabb944765d0a8bcefd0
Jack Yu [Thu, 22 Mar 2018 23:28:13 +0000 (16:28 -0700)]
Enable Checkstyle for "repo upload" for more projects.
This CL enables Checkstyle for the following directories:
- telephony/
Bug:
34746646,
32954735
Test: Compilation
Change-Id: Ia67eaf5b871e6b74f21344fef1572835801843a5
Ivan Podogov [Thu, 22 Mar 2018 23:03:17 +0000 (23:03 +0000)]
Merge "HIDD: Address API Review concerns"
am:
8085d6f247
Change-Id: I7f4e272657874b02d122f7ddc291c0f006eeee30
Treehugger Robot [Thu, 22 Mar 2018 21:50:57 +0000 (21:50 +0000)]
Merge "HIDD: Address API Review concerns"
Elliott Hughes [Thu, 22 Mar 2018 21:06:37 +0000 (14:06 -0700)]
Prune files from /data/anr/ by number as well as age.
tombstoned prunes based on both age and number of files. Until we can
fully switch over to tombstoned, emulate that here too.
Bug: http://b/
73140330
Test: ran tests
Change-Id: I824034019e91d541fc7b7ba49d152e1ceaf37621
Ying Xu [Thu, 22 Mar 2018 20:32:35 +0000 (20:32 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()"
am:
ec76adb9ff
Change-Id: I437a82ea0d7d71102f273cbca1b54ef7f332027e
Pankaj Kanwar [Thu, 22 Mar 2018 19:10:11 +0000 (19:10 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false""
am:
320b6c2312
Change-Id: Ie6f23da9c3c531fef9eb32b52d377a8f0e772b77
Ying Xu [Thu, 22 Mar 2018 19:07:45 +0000 (19:07 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()"
Tej Singh [Thu, 22 Mar 2018 18:30:31 +0000 (18:30 +0000)]
Revert "Revert "Logging: Bluetooth Enabled""
This reverts commit
46850eb3d2180d29751a18056ae094965e840827.
Reason for revert: The dummy StatsLog class was merged into stage-aosp-master and oc-mr1-dev-plus-aosp, which were the branches that broke initially.
Change-Id: Iab9bac487d845db0ba70b2622679523604b4944e
Tej Singh [Thu, 22 Mar 2018 18:23:52 +0000 (18:23 +0000)]
Merge "Dummy StatsLog class" into stage-aosp-master
Pankaj Kanwar [Thu, 22 Mar 2018 17:03:39 +0000 (17:03 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false""
David Srbecky [Wed, 21 Mar 2018 12:58:00 +0000 (12:58 +0000)]
Fix mini-debug-info generation for apps with wrap.sh script.
Debuggable apps enable mini-debug-info after fork, however, this does not
work with apps with wrap.sh script since they follow different code path.
Enable mini-debug-info generation for those as well.
Bug:
74070426
Test: check that app with wrap.sh generates debug info for JIT now
Change-Id: I489ac3c82bcced8fc0448ed5666f67009cbb043d
Chalard Jean [Tue, 20 Mar 2018 10:13:57 +0000 (19:13 +0900)]
Have PermissionMonitor arbiter which app can access background networks
This will let ConnectivityService send the right callbacks to the
relevant apps.
Test: manual with apps
runtest frameworks-net
cts
new tests for this functionality
Bug:
67408339
Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4
Jordan Liu [Thu, 22 Mar 2018 06:34:31 +0000 (06:34 +0000)]
Merge "Finalise STK call control strings"
am:
249119da53
Change-Id: Id1179bcd212731f5ceff44ad45b9f7ab6643c5c6
Remi NGUYEN VAN [Tue, 6 Mar 2018 03:36:54 +0000 (12:36 +0900)]
Add method to NetworkStatsService for UID stats.
Useful for clients such as BatteryStats which currently rely
on NetworkStatsFactory. Data at that stage is incomplete as
it does not account for tethering, VT data and corresponding
464xlat corrections.
Test: runtest frameworks-net, CTS tests pass.
Change-Id: I763b77f601c827fd2963204694fb5b45425cc791
Holly Jiuyu Sun [Thu, 22 Mar 2018 05:59:18 +0000 (05:59 +0000)]
Merge "Mark eraseSubscriptions as @SystemApi."
am:
a99b258049
Change-Id: Id2be8785239c34dbe705f0614aa9bfa9daa0aeec
Jordan Liu [Thu, 22 Mar 2018 05:14:31 +0000 (05:14 +0000)]
Merge "Finalise STK call control strings"
Chalard Jean [Fri, 9 Mar 2018 11:52:15 +0000 (20:52 +0900)]
Have the status bar listen to all macro-users VPN changes.
Bug:
73217368
Test: manual
Using Datally on work profile. Before this, enabling the VPN
does not show the key icon. After this it does.
Change-Id: I454eb8f3881a48af1b0187c2b14a2a399d3c2445
Holly Jiuyu Sun [Thu, 22 Mar 2018 03:45:55 +0000 (03:45 +0000)]
Merge "Mark eraseSubscriptions as @SystemApi."
Tej Singh [Fri, 2 Mar 2018 02:22:55 +0000 (18:22 -0800)]
Dummy StatsLog class
This is a dummy class that provides StatsLog.write methods and
appropriate constants to log atoms in aosp.
Merged-In: Ib14a74eabfab08bbae5d4d549244f1022e8c34f0
Test: build success on Marlin
Change-Id: I606bc8a96337ced842eb7a2bcba8c4969c9d4748
Jordan Liu [Thu, 22 Mar 2018 00:39:12 +0000 (17:39 -0700)]
Finalise STK call control strings
Bug:
64685331
Bug:
70352301
Test: manual
Change-Id: I53e9ec5e520f960b7adb3a29770e1f57065eb4c8
Stanley Tng [Wed, 21 Mar 2018 23:29:40 +0000 (23:29 +0000)]
Merge "Calls unlinkToDeath in binderDied to deregister"
am:
72fa61b325
Change-Id: Ica7438fe5ebd978192226f3e2b8a0630b843b752
Xin Li [Wed, 21 Mar 2018 23:20:46 +0000 (23:20 +0000)]
Merge "Enable Belarusian and Latin languages in fontchain_lint tool."
am:
b2df57a42f
Change-Id: I04c23e2c723e591e45310a8d380c2793e0fe05b4
Tyler Gunn [Wed, 21 Mar 2018 22:11:33 +0000 (22:11 +0000)]
Merge "Add Telecom debug setting for enabling enhanced call blocking."
am:
727097a400
Change-Id: I2b2eea70d0c755acc9c2f14a79bca91ea37720d1
Treehugger Robot [Wed, 21 Mar 2018 22:04:50 +0000 (22:04 +0000)]
Merge "Calls unlinkToDeath in binderDied to deregister"
nharold [Wed, 21 Mar 2018 22:03:21 +0000 (22:03 +0000)]
Merge "Add alpha Strings to CellIdentityTdscdma"
am:
08ee27ff90
Change-Id: If7773f0c56c3655398f15840bc9fd446755093a1
Treehugger Robot [Wed, 21 Mar 2018 21:48:08 +0000 (21:48 +0000)]
Merge "Enable Belarusian and Latin languages in fontchain_lint tool."
Yueming Wang [Wed, 21 Mar 2018 21:05:59 +0000 (21:05 +0000)]
Merge "Revert "Logging: Bluetooth Enabled""
am:
21a9ebeb6c
Change-Id: I0f4649369bf3d4c92ef487eaa471ca9481185478
Tyler Gunn [Wed, 21 Mar 2018 21:02:24 +0000 (21:02 +0000)]
Merge "Add Telecom debug setting for enabling enhanced call blocking."