git.osdn.net Git - android-x86/frameworks-base.git/log

Merge "Some of us are weird." am: 559d6018b6
am: 99c3f55c89

Change-Id: I9605a2e5f9efd41ca4c5eb0e6f0c636e6920774d

Merge "Some of us are weird."
am: 559d6018b6

Change-Id: Icf919c902d9a7e5e8eda1ac2e7f551cf51891281

Merge "Some of us are weird."

Merge "VpnDialogs should be able to control always-on VPN." am: d5d7492040
am: 09aa059ec4

Change-Id: I3d2f5c5a7bc199551aad1ddb656dc076e3121fb3

Merge "VpnDialogs should be able to control always-on VPN."
am: d5d7492040

Change-Id: I08f5f69168f58318afb0fd848a8177319018356a

commit | commitdiff | tree

Treehugger Robot [Wed, 30 Jan 2019 19:34:47 +0000 (19:34 +0000)]

Merge "VpnDialogs should be able to control always-on VPN."

Merge "new API for IMS call fail cause" am: ebad5a64d0
am: 634594fb41

Change-Id: Ie6362bc5a6e7c372e7e60277feb48436a852f610

Merge "[layout precompilation] Add testing hook for precompiled layouts" am: 15b86c9037
am: 0b329918fc

Change-Id: I6417624f74b779e05f5a4a30c484487a943697c6

Merge "new API for IMS call fail cause"
am: ebad5a64d0

Change-Id: I70870709a27c48bc30c748e04e53c72780224bd8

Merge "[layout precompilation] Add testing hook for precompiled layouts"
am: 15b86c9037

Change-Id: I7c1e46dc5ebce025e1aafd6131596d352e0c1bc8

Merge "new API for IMS call fail cause"

commit | commitdiff | tree

Treehugger Robot [Wed, 30 Jan 2019 17:55:18 +0000 (17:55 +0000)]

Merge "[layout precompilation] Add testing hook for precompiled layouts"

commit | commitdiff | tree

Andrei-Valentin Onea [Wed, 30 Jan 2019 17:14:17 +0000 (09:14 -0800)]

Merge "Initialise hidden api usage logger pre-fork" am: 763747b7ce
am: c14670fc8e

Change-Id: I10aba0942a240ee041306c1bf24e6bed37e62f0a

VpnDialogs should be able to control always-on VPN.

Bug: 77468593
Test: atest HostsideVpnTests#testIsAlwaysOnIsLockdown
Change-Id: I0a0c6b138c748a6cb8681c20c137f70ee1fc6cf9

commit | commitdiff | tree

Andrei-Valentin Onea [Wed, 30 Jan 2019 17:00:41 +0000 (09:00 -0800)]

Merge "Initialise hidden api usage logger pre-fork"
am: 763747b7ce

Change-Id: Ic1bd433cb1dc61c0f048c70f33360a41f7bde2c5

commit | commitdiff | tree

Andrei-Valentin Onea [Wed, 30 Jan 2019 16:42:54 +0000 (16:42 +0000)]

Merge "Initialise hidden api usage logger pre-fork"

[layout precompilation] Add testing hook for precompiled layouts

We want to be able to control at a fine grained level whether precompiled
layouts are enabled so we can compare inflation results with and without. This
changes adds a @TestApi method that supports this.

Bug: 111895153
Merged-In: Ib6b62d79a9ca7aefefff8639752aa5838e491038
Change-Id: I2f28f6912499825e52c17cc163be9c0fe93855cb

Merge "Track ZygoteHooks API changes in libcore" am: 20bca262f5
am: 97ba02c505

Change-Id: I3b377b6bd83cf6d7d293c89931ac13560e9db2c7

Initialise hidden api usage logger pre-fork

Topic: hidden-api-reporting-upcall
Test: m
Bug: 119217680
Change-Id: I8722f0bf4275fea4a8faf41d7b862c04b4014824
Merged-In: I80f82092ef779a7dc1f1322cb7c05ebf5e59939b

Merge "Track ZygoteHooks API changes in libcore"
am: 20bca262f5

Change-Id: I9245629f0a5ba6fed9695f591396747eb1ae911c

Merge "Track ZygoteHooks API changes in libcore"

Merge "API: Fix missing @NonNull annotations" am: b852f6636f
am: d1f5939c1a

Change-Id: I3d0ac8768dcc9c314e235dc679752dd5cbfde0c5

Merge "API: Add missing nullability annotations" am: e148fbcf03
am: 336e11018e

Change-Id: Idb6cbb94968f4a2ffe3055291f23fc903fe923a0

Merge "API: Fix missing @NonNull annotations"
am: b852f6636f

Change-Id: Id6451f9cd18debf51137a81159ead79064fbafca

Merge "API: Add missing nullability annotations"
am: e148fbcf03

Change-Id: I6b092f370a8b2eba20d19c6e43b4e5f5b217af16

Merge "API: Fix missing @NonNull annotations"

Merge "API: Add missing nullability annotations"

Merge "move ServiceState.getDataRegState to greylist" am: 607e797932
am: 43640ec075

Change-Id: Icf40ec83d25ec8057429e3b142fea6506f2ebe40

commit | commitdiff | tree

Michele Berionne [Wed, 30 Jan 2019 06:42:29 +0000 (22:42 -0800)]

Merge "Add APIs to get/set if usage of multiple SIMs is restricted." am: 59133875e7
am: e01966e89b

Change-Id: I383b701bff4c77596fad1d72929a5afcc5b0cf56

Merge "move ServiceState.getDataRegState to greylist"
am: 607e797932

Change-Id: I7d63f204bb34e462039d3889d1876b3264d0f567

commit | commitdiff | tree

Michele Berionne [Wed, 30 Jan 2019 06:31:18 +0000 (22:31 -0800)]

Merge "Add APIs to get/set if usage of multiple SIMs is restricted."
am: 59133875e7

Change-Id: Ie9c2a17b65f21862502056957ff5603b62f7d4dd

Merge "move ServiceState.getDataRegState to greylist"

commit | commitdiff | tree

Michele Berionne [Wed, 30 Jan 2019 06:18:19 +0000 (06:18 +0000)]

Merge "Add APIs to get/set if usage of multiple SIMs is restricted."

commit | commitdiff | tree

Remi NGUYEN VAN [Wed, 30 Jan 2019 05:33:27 +0000 (21:33 -0800)]

Merge "Compile NetworkStack as system_current" am: 17c303b79d
am: d3e0862b2c

Change-Id: I6f232f2bdd1206cc8b7d226fdae2c53b6f40fe05

commit | commitdiff | tree

Remi NGUYEN VAN [Wed, 30 Jan 2019 05:27:50 +0000 (21:27 -0800)]

Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c
am: 4845df3ced

Change-Id: I488fc028b8fd2aa5a09464082c65a4889a8a6b62

commit | commitdiff | tree

Remi NGUYEN VAN [Wed, 30 Jan 2019 05:18:39 +0000 (21:18 -0800)]

Merge "Compile NetworkStack as system_current"
am: 17c303b79d

Change-Id: If74cbb1e9f59373636350c24aa07831d1705db49

commit | commitdiff | tree

Remi NGUYEN VAN [Wed, 30 Jan 2019 05:13:46 +0000 (21:13 -0800)]

Merge "Remove last NetworkStack usage of hidden APIs"
am: 16ec5d038c

Change-Id: I27c78d09938f672a4428a17436d5ed0541170d0d

commit | commitdiff | tree

Remi NGUYEN VAN [Wed, 30 Jan 2019 04:56:15 +0000 (04:56 +0000)]

Merge "Compile NetworkStack as system_current"

commit | commitdiff | tree

Remi NGUYEN VAN [Wed, 30 Jan 2019 04:55:21 +0000 (04:55 +0000)]

Merge "Remove last NetworkStack usage of hidden APIs"

[automerger skipped] Merge "Whitelist packages from VPN lockdown: DPM API." am: c9d834e3f5
am: aade923534 -s ours
am skip reason: change_id I7508070f828fb7150df5d9e34846535d57c6a7c3 with SHA1 5cba336daf is in history

Change-Id: Ic053580559dbe0733a19c2d74fab3fba374428ba

Merge "Whitelist packages from VPN lockdown: DPM API."
am: c9d834e3f5

Change-Id: I5723a0970a0e37995c9db6e42ae527b8692bc48a

Add APIs to get/set if usage of multiple SIMs is restricted.

Add API that indicates if the usage of multiple SIMs at the same time is
allowed or restricted in order to support requirements from carriers for
dual SIM devices

Bug: 123537730
Test: Verified with test application.
Change-Id: I5e3e5ff41927e43ead4a30988630cf9125d5a048
Merged-In: I5e3e5ff41927e43ead4a30988630cf9125d5a048
(cherry picked from commit 398d5d91136d6e2146bf56ad3bdbb326a835c8ef)

commit | commitdiff | tree

Treehugger Robot [Wed, 30 Jan 2019 01:29:45 +0000 (01:29 +0000)]

Merge "Whitelist packages from VPN lockdown: DPM API."

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 12:32:48 +0000 (21:32 +0900)]

Compile NetworkStack as system_current

Test: make NetworkStack
Test: flashed, WiFi and tethering working
Bug: 112869080
Change-Id: I2d805c0fefe271199f4f0e0d49d91e03f41a7eef

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 06:38:52 +0000 (15:38 +0900)]

Remove last NetworkStack usage of hidden APIs

Includes various small changes to stop using hidden APIs

Test: make NetworkStack
Test: flashed, booted, WiFi and tethering working
Bug: 112869080
Change-Id: Id2830795a444f484b377ed6437435a1cd833697a

Merge "Add IntRange and FloatRange annotations" am: 94a9377222
am: 74798a771a

Change-Id: I6353003144e4c2cf5882d20d2d37921dc69b4bcf

Merge "Add IntRange and FloatRange annotations"
am: 94a9377222

Change-Id: Iab472ad2c0ffe875069ea7b71ce10a14e9ef70f5

Merge "Add IntRange and FloatRange annotations"

move ServiceState.getDataRegState to greylist

given we don't have a public alternatives for dataregstate for Q,
thus we shouldn't move this API to app-compat dark list.

Bug: 123099466
Test: Build
Change-Id: I67531ce536e004e1bc0f764824a261fb51cd27fa

Merge "Merge "Card ID APIs are public" am: bd4a4dc889" into stage-aosp-master
am: 22a8239b6a

Change-Id: If3f27b835cacaff13d19d8dbe36d59b4f2265439

Merge "Card ID APIs are public" am: bd4a4dc889
am: a039e692a4

Change-Id: I6041944772567794b79a355c9f77767ed61c0f76

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 29 Jan 2019 23:14:51 +0000 (23:14 +0000)]

Merge "Merge "Card ID APIs are public" am: bd4a4dc889" into stage-aosp-master

Merge "Card ID APIs are public"
am: bd4a4dc889

Change-Id: Ie436f74a0501d46ac12ea641ab71741fc6cbf3ba

Merge "Card ID APIs are public"
am: bd4a4dc889

Change-Id: I2cf670328f7b2f35d6009eecb0e3741311d6e2df

Merge "Card ID APIs are public"

Merge "v3 keys use SP800 derivation" into pi-dev
am: 83924aca2c

Change-Id: I4d74a329823a05473089936cb2f6907aeda56013

Add IntRange and FloatRange annotations

Bug: 123223163
Test: Build
Change-Id: I17f27075007df642ec93e5b762b0717da4a1e927

commit | commitdiff | tree

TreeHugger Robot [Tue, 29 Jan 2019 21:53:43 +0000 (21:53 +0000)]

Merge "v3 keys use SP800 derivation" into pi-dev

Whitelist packages from VPN lockdown: DPM API.

Bug: 77468593
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7508070f828fb7150df5d9e34846535d57c6a7c3
Merged-In: I7508070f828fb7150df5d9e34846535d57c6a7c3

commit | commitdiff | tree

TreeHugger Robot [Tue, 29 Jan 2019 21:44:13 +0000 (21:44 +0000)]

Merge "Whitelist packages from VPN lockdown: DPM API." into pi-dev-plus-aosp

commit | commitdiff | tree

Sooraj Sasindran [Tue, 29 Jan 2019 20:21:17 +0000 (12:21 -0800)]

Merge "Define more thresholds for opportunistic data" am: cf2e069962
am: c3bf9392ac

Change-Id: I44cd2e063fd5587ee7abf77e22acca7b08953a02

Merge changes I94d15307,I7deb8556,I755b3140 am: 5aef5c6508
am: b7493c6059

Change-Id: I5f316278424f6c072c14f52e067d3306491b4a13

commit | commitdiff | tree

Sooraj Sasindran [Tue, 29 Jan 2019 20:09:58 +0000 (12:09 -0800)]

Merge "Define more thresholds for opportunistic data"
am: cf2e069962

Change-Id: I8426e90c7f8a6b251e3bfdf0e2f3f0cf819fa777

Merge changes I94d15307,I7deb8556,I755b3140
am: 5aef5c6508

Change-Id: I2e38b52aeff244bdec199907f5cf90ce23ecbbfe

Track ZygoteHooks API changes in libcore

Track ZygoteHooks API changes in libcore to make
the ZygoteHooks API more consistent.

Bug: 111742291
Test: build / boot / treehugger
Merged-In: Ie65aac6539cffc90663807791511b95a6cd61ab4
Change-Id: Ie65aac6539cffc90663807791511b95a6cd61ab4

Some of us are weird.

Test: dsandler can give OWNERS approval
Change-Id: I9b4f7903513e7171dfa51aa39a32b6bcfbfbb0eb

commit | commitdiff | tree

Sooraj Sasindran [Tue, 29 Jan 2019 19:43:26 +0000 (19:43 +0000)]

Merge "Define more thresholds for opportunistic data"

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Jan 2019 19:27:53 +0000 (19:27 +0000)]

Merge changes I94d15307,I7deb8556,I755b3140

* changes:
  Atom: Add more Bluetooth atoms
  Atom: Add A2DP playback related atoms to StatsLog
  Fix typo in hci/enums.proto: OCCURED -> OCCURRED

Card ID APIs are public

These were system API but we should expose them for apps with carrier
privileges.

Test: manual
Bug: 122974656
Change-Id: Ie60e4c580dfa9dd0d7d6fb6b94226661d0620dad

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 29 Jan 2019 17:45:39 +0000 (17:45 +0000)]

Merge "Merge "Add check for slot index value" am: d8148b6c8c am: e7d03a6ff1" into pi-dev-plus-aosp

commit | commitdiff | tree

Michele Berionne [Tue, 29 Jan 2019 17:45:09 +0000 (09:45 -0800)]

Merge "Add check for slot index value" am: d8148b6c8c
am: e7d03a6ff1

Change-Id: I57c57b70484ec0c08bcd7b02e880fbe28e2cde9e

[automerger skipped] Merge "[DO NOT MERGE]Add check for slot index value" into pi-dev
am: dbf0f79d4a -s ours
am skip reason: SHA1 dbf0f79d4a skipped by user mberionne

Change-Id: I74f89c391a079b57a36ed79a97c63f5e96e8d7c3

commit | commitdiff | tree

Michele Berionne [Tue, 29 Jan 2019 17:34:53 +0000 (09:34 -0800)]

Merge "Add check for slot index value"
am: d8148b6c8c

Change-Id: I33be18a2fb8b3e35e521bdea28354ba1b7daa5b9

commit | commitdiff | tree

Michele Berionne [Tue, 29 Jan 2019 17:25:17 +0000 (17:25 +0000)]

Merge "Add check for slot index value"

Merge "apilint: Allow parsing 3.0 signature files" am: 34b11c92b3
am: f9cd2cb759

Change-Id: I0ef6e376da489473f777cbc8abf43c0381a9376c

Merge "apilint: Allow parsing 3.0 signature files"
am: 34b11c92b3

Change-Id: I0cc45b11f079c7a0d383b49e74d55658a8915d71

Merge "apilint: Allow parsing 3.0 signature files"

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 14:59:13 +0000 (06:59 -0800)]

Merge "Revert "Extract network observer code from NetworkManagementService."" am: 9fdc6d2963
am: 04f4e4ed88

Change-Id: I75e37fb6e8681b2f64831ddc2dade382426e4859

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 14:47:16 +0000 (06:47 -0800)]

Merge "Revert "Extract network observer code from NetworkManagementService.""
am: 9fdc6d2963

Change-Id: Ib4a7b32a143b3c8f029ccd92191494cd9579e8bd

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 14:30:56 +0000 (14:30 +0000)]

Merge "Revert "Extract network observer code from NetworkManagementService.""

apilint: Allow parsing 3.0 signature files

Test: python apilint_test.py
Change-Id: I59df950229c05329afde93f94efc13adb4640ad7

Merge "[DO NOT MERGE]Add check for slot index value" into pi-dev

Merge "Move FdEventsReader to the shared area." am: 4a838a68d6
am: 06318332ef

Change-Id: I0f4418b73b455f9b37ae8f5b2ca1a19884c51ff9

Merge "Move FdEventsReader to the shared area."
am: 4a838a68d6

Change-Id: I27ecc795228c7bd91c8443a9ba3dad19d8010cf8

commit | commitdiff | tree

Treehugger Robot [Tue, 29 Jan 2019 11:45:15 +0000 (11:45 +0000)]

Merge "Move FdEventsReader to the shared area."

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 11:45:10 +0000 (03:45 -0800)]

Merge "Run IpClientLinkObserver on Binder thread" am: f89a1cfd21
am: d91372e4cb

Change-Id: Icd4bd866a14f3da2e74049fa8cda44bcbd5728f3

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 11:34:23 +0000 (03:34 -0800)]

Merge "Add utils connect, setsockopt, bind, sendTo" am: 1e002eede3
am: dfa16fe772

Change-Id: Ib5ebe3134fb1d53581b9d91b4f4f142afb5e9fb3

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 11:29:01 +0000 (03:29 -0800)]

Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe
am: ca1d65e707

Change-Id: I978bdb626c1f4c8bbe736c8bad1c74fb6a67b4b5

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 11:25:26 +0000 (03:25 -0800)]

Merge "Run IpClientLinkObserver on Binder thread"
am: f89a1cfd21

Change-Id: I13c2a2c9c03c26777eb9c57e0ec62eab3d2df7da

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 11:21:22 +0000 (03:21 -0800)]

Merge "Add utils connect, setsockopt, bind, sendTo"
am: 1e002eede3

Change-Id: Ida2a99f35affe3cb9213f71ba622ace51c4d6f57

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 11:17:41 +0000 (03:17 -0800)]

Merge "Add NetworkUtils utilities to SystemApi"
am: 9cc31061fe

Change-Id: I82f20718d86b08cd0916ee33300ca0ee734305a6

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 11:07:42 +0000 (11:07 +0000)]

Merge "Run IpClientLinkObserver on Binder thread"

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 11:07:20 +0000 (11:07 +0000)]

Merge "Add utils connect, setsockopt, bind, sendTo"

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 11:07:04 +0000 (11:07 +0000)]

Merge "Add NetworkUtils utilities to SystemApi"

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 04:03:38 +0000 (04:03 +0000)]

Revert "Extract network observer code from NetworkManagementService."

This reverts commit d8bc829a85c9c9bb390e18b59ef1455b6d0b94ec.

Reason for revert: Refactoring was unnecessary

Merged-In: Ib4e7da3274e49f25676505a08e6ce7e7b0dfdb8d
Change-Id: Iff332c680315b560f0b762c1d7311ec83d539115

Move FdEventsReader to the shared area.

This is necessary both in the network stack app and the
framework.

Test: FrameworksNetTests
Change-Id: I48af0ab29405501f0581a6c0c9ce6e5d4a32c8b4

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 09:27:43 +0000 (01:27 -0800)]

Merge "Remove IpClient usage of NetworkManagementService" am: 9fe79edfd2
am: 3af3f76129

Change-Id: I56ab41ca39dc745554534f3e85f5fc4257cc902a

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 09:16:21 +0000 (01:16 -0800)]

Merge "Remove IpClient usage of NetworkManagementService"
am: 9fe79edfd2

Change-Id: Ia66a457d3cb73c92c97de025348724fa3f5cbc55

commit | commitdiff | tree

Remi NGUYEN VAN [Tue, 29 Jan 2019 08:58:32 +0000 (08:58 +0000)]