OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." am: 34e0a257d5
Tyler Gunn [Tue, 2 May 2017 20:55:45 +0000 (20:55 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." am: 34e0a257d5
am: a2ed986390

Change-Id: I438bacc7028fb2c385a6dd21a79172f145490f6d

7 years agoMerge "Change MANAGE_OWN_CALLS permission to be a "normal" permission."
Tyler Gunn [Tue, 2 May 2017 20:48:09 +0000 (20:48 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission."
am: 34e0a257d5

Change-Id: I4c996f0e2e3d56bb36231f765a0d1a4d15cc171c

7 years agoMerge "Change MANAGE_OWN_CALLS permission to be a "normal" permission."
Tyler Gunn [Tue, 2 May 2017 20:36:37 +0000 (20:36 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission."

7 years agoMerge "SymbolComparator operator() is missing const" am: e74483074e
Yi Kong [Tue, 2 May 2017 18:31:59 +0000 (18:31 +0000)]
Merge "SymbolComparator operator() is missing const" am: e74483074e
am: a522b4af78

Change-Id: If68306b217d19fb1d1d4bc71a8fd452a47aa8ed2

7 years agoMerge "SymbolComparator operator() is missing const"
Yi Kong [Tue, 2 May 2017 18:26:57 +0000 (18:26 +0000)]
Merge "SymbolComparator operator() is missing const"
am: e74483074e

Change-Id: I86f332f10f87d519c42c5880c49dacf98be2c9e5

7 years agoMerge "SymbolComparator operator() is missing const"
Yi Kong [Tue, 2 May 2017 18:15:02 +0000 (18:15 +0000)]
Merge "SymbolComparator operator() is missing const"

7 years agoChange MANAGE_OWN_CALLS permission to be a "normal" permission.
Tyler Gunn [Fri, 28 Apr 2017 17:45:23 +0000 (10:45 -0700)]
Change MANAGE_OWN_CALLS permission to be a "normal" permission.

Also remove from Phone group since this isn't really related to phone
calls as much as interacting with Telecom APIs.

Test: Manual
Bug: 37722558
Merged-In: Ia972db4bd79a34bc9b9d3896910adc205c286367
Change-Id: Icc4d2170cc7c83f653eeb0438938f7c0c91a0a7c

7 years agoDO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to...
Erik Wolsheimer [Tue, 2 May 2017 15:59:55 +0000 (15:59 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s am: a686345759
am: a399705286

Change-Id: I31b67a7bb496051a9062d4770a96119251a1b434

7 years agoDO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s
Erik Wolsheimer [Tue, 2 May 2017 15:54:40 +0000 (15:54 +0000)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s
am: a686345759

Change-Id: I0598c6210dbf0d0447c31112419a2fee829037be

7 years agoMerge "Force a light to be set for the first time" am: e6ad7a6704
Oleksiy Avramchenko [Tue, 2 May 2017 12:53:33 +0000 (12:53 +0000)]
Merge "Force a light to be set for the first time" am: e6ad7a6704
am: 96a8556990

Change-Id: I5caed909e1ba67931f05b0b44a0ff0fd62b131d0

7 years agoMerge "Force a light to be set for the first time"
Oleksiy Avramchenko [Tue, 2 May 2017 12:48:34 +0000 (12:48 +0000)]
Merge "Force a light to be set for the first time"
am: e6ad7a6704

Change-Id: Icc13b24debc55f4c107dea61123e468a79828f11

7 years agoMerge "Force a light to be set for the first time"
Treehugger Robot [Tue, 2 May 2017 12:42:12 +0000 (12:42 +0000)]
Merge "Force a light to be set for the first time"

7 years agoMerge "Track libcore change 03e8c7dca78a95ccf719a7." am: 194f8471fd
Narayan Kamath [Tue, 2 May 2017 10:19:30 +0000 (10:19 +0000)]
Merge "Track libcore change 03e8c7dca78a95ccf719a7." am: 194f8471fd
am: f06800c3ff

Change-Id: I3c734734bf553e0b4695a897de113d9031f18abd

7 years agoMerge "Track libcore change 03e8c7dca78a95ccf719a7."
Narayan Kamath [Tue, 2 May 2017 10:13:48 +0000 (10:13 +0000)]
Merge "Track libcore change 03e8c7dca78a95ccf719a7."
am: 194f8471fd

Change-Id: Ie4fbcc4defee14c91cd3b84adf4f3ae5f47add3f

7 years agoMerge "Track libcore change 03e8c7dca78a95ccf719a7."
Narayan Kamath [Tue, 2 May 2017 10:06:48 +0000 (10:06 +0000)]
Merge "Track libcore change 03e8c7dca78a95ccf719a7."

7 years agoMerge "NsdManager: add test coverage for discoverServices()" am: 3e21b1745c
Hugo Benichi [Tue, 2 May 2017 08:59:22 +0000 (08:59 +0000)]
Merge "NsdManager: add test coverage for discoverServices()" am: 3e21b1745c
am: 60182dbe4e

Change-Id: I341cbbfd36b4e849651505c187053115833ca4b0

7 years agoMerge "NsdManager: add test coverage for discoverServices()"
Hugo Benichi [Tue, 2 May 2017 08:54:46 +0000 (08:54 +0000)]
Merge "NsdManager: add test coverage for discoverServices()"
am: 3e21b1745c

Change-Id: I0fd1d8e6ea3264a96b144c6701200f7b0be5f9c4

7 years agoMerge "NsdManager: add test coverage for discoverServices()"
Treehugger Robot [Tue, 2 May 2017 08:44:27 +0000 (08:44 +0000)]
Merge "NsdManager: add test coverage for discoverServices()"

7 years agoForce a light to be set for the first time
Oleksiy Avramchenko [Tue, 25 Apr 2017 10:30:49 +0000 (12:30 +0200)]
Force a light to be set for the first time

The check in LightImpl::setLightLocked skips HAL call if light
parameters aren't changed. During initialization these parameters
are zeroed, thus it's not possible to turn the light off at the
startup.

As an example this fixes the issue with "stuck" battery light
in the following scenario:
1. Device has secure start-up option set (either pin or pattern).
2. Charger is connected at the startup and battery light shows the
   charging state on pin or pattern prompt.
3. Device is unlocked and charger disconnected after some time,
   e.g. after com.android.server.lights.LightsService restarted.
4. The battery light is not off and stuck in the previous state
   until charger is connected / disconnected again.

Bug: 37662368
Test: manual - follow the above step-by-step
Change-Id: I45470e945fe4d26d37a5641dfff3311968f51ee4

7 years agoMerge "NsdManager: unit test coverage for servive registration" am: b0e408450c
Hugo Benichi [Tue, 2 May 2017 06:42:44 +0000 (06:42 +0000)]
Merge "NsdManager: unit test coverage for servive registration" am: b0e408450c
am: bc57faa1ac

Change-Id: I55a7a1a33cfd30a5c8d5ede67f6a1c602a840e6a

7 years agoMerge "NsdManager: unit test coverage for servive registration"
Hugo Benichi [Tue, 2 May 2017 06:35:11 +0000 (06:35 +0000)]
Merge "NsdManager: unit test coverage for servive registration"
am: b0e408450c

Change-Id: I0b47ad5a1ccee4a2efb169d717b512a46ad4ecc2

7 years agoMerge "NsdManager: unit test coverage for servive registration"
Treehugger Robot [Tue, 2 May 2017 06:27:08 +0000 (06:27 +0000)]
Merge "NsdManager: unit test coverage for servive registration"

7 years agoNsdManager: add test coverage for discoverServices()
Hugo Benichi [Fri, 28 Apr 2017 04:29:21 +0000 (13:29 +0900)]
NsdManager: add test coverage for discoverServices()

Test: added new tests
Bug: 3701336933298084
Change-Id: If6c1113ee1bd4690db90abd5a61c3e229c827aec

7 years agoNsdManager: unit test coverage for servive registration
Hugo Benichi [Fri, 28 Apr 2017 02:01:22 +0000 (11:01 +0900)]
NsdManager: unit test coverage for servive registration

This patch adds test coverage for NsdManager#registerService() and
NsdManager#unregisterService(). This test shows a potential defect in
the api: if unregisterService() fails, the associated listener is always
unregistered from NsdManager. If the service initially registered is
still registered, this potentially make it impossible to unregister.

Test: added new unit test
Bug: 3701336933298084
Change-Id: Ia089b6d2f2a349907a8b29d9a3acd7f59e177887

7 years agoDO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s
Erik Wolsheimer [Mon, 1 May 2017 21:58:31 +0000 (14:58 -0700)]
DO NOT MERGE Adjust WALLPAPER_RECONNECT_TIMEOUT_MS in WallpaperManagerService to 15s

Bug: 37773684
Change-Id: Ifeeb26a164c7bab59561721d10a4915ed6d9dcf3

7 years agoMerge "Remove no-op std::max call" am: c00af4c533
Yi Kong [Mon, 1 May 2017 18:46:15 +0000 (18:46 +0000)]
Merge "Remove no-op std::max call" am: c00af4c533
am: ef5e579cec

Change-Id: I140b00023b25f2609137eb223ba4641057a418b5

7 years agoMerge "Remove no-op std::max call"
Yi Kong [Mon, 1 May 2017 18:40:43 +0000 (18:40 +0000)]
Merge "Remove no-op std::max call"
am: c00af4c533

Change-Id: I9bbbb3689d51e364752efe7b5f1b21f30bc3de18

7 years agoMerge "Remove no-op std::max call"
Yi Kong [Mon, 1 May 2017 18:29:24 +0000 (18:29 +0000)]
Merge "Remove no-op std::max call"

7 years agoSymbolComparator operator() is missing const
Yi Kong [Mon, 1 May 2017 17:57:39 +0000 (10:57 -0700)]
SymbolComparator operator() is missing const

Clean up, no functionality change.

Test: build
Bug: 37752547
Change-Id: I7b6f368c0d0776f956a8b99353df7b23cbbc388d

7 years agoAdd missing symbol
Colin Cross [Mon, 1 May 2017 01:33:25 +0000 (18:33 -0700)]
Add missing symbol

Bug: 35998031
Test: builds
Change-Id: Ie085b4058c5714df9913ceb9fd03fb4658168520

7 years agoRemove no-op std::max call
Yi Kong [Mon, 1 May 2017 06:51:33 +0000 (23:51 -0700)]
Remove no-op std::max call

This was calling std::max on an unsigned integer and 0, which is
essentially no-op. Remove this code.

Test: Build
Bug: 37752547
Change-Id: I74ce45b95960621dff11f574fbe1af60ad147cf0

7 years agoMerge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations"...
Erik Kline [Sat, 29 Apr 2017 07:46:00 +0000 (07:46 +0000)]
Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" am: 169681db26
am: b663a7d6d7

Change-Id: I64d3251de665cead6b0067728574b367698619d2

7 years agoMerge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations"
Erik Kline [Sat, 29 Apr 2017 07:39:58 +0000 (07:39 +0000)]
Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations"
am: 169681db26

Change-Id: Ifd9e1c3645c2fa7c6671991edf52d1deb63d9d1c

7 years agoMerge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations"
Erik Kline [Sat, 29 Apr 2017 07:33:34 +0000 (07:33 +0000)]
Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations"

7 years agoUse ConnectivityService's NETWORK_STACK permission for SoftAp operations
Erik Kline [Sat, 29 Apr 2017 04:20:04 +0000 (13:20 +0900)]
Use ConnectivityService's NETWORK_STACK permission for SoftAp operations

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
Bug: 37647880
Bug: 37750597
Change-Id: I4fb603b7491013bc13b0c08a785eae6cd37337b9

7 years agoMerge "Add android.os.VintfRuntimeInfo" am: 4f8a375958
Yifan Hong [Sat, 29 Apr 2017 03:12:52 +0000 (03:12 +0000)]
Merge "Add android.os.VintfRuntimeInfo" am: 4f8a375958
am: e0bf06dd9e

Change-Id: Iae968194f2dbaa2effcf19399b1165a233aa32ba

7 years agoMerge "Add android.os.VintfRuntimeInfo"
Yifan Hong [Sat, 29 Apr 2017 03:07:09 +0000 (03:07 +0000)]
Merge "Add android.os.VintfRuntimeInfo"
am: 4f8a375958

Change-Id: If9e389879ac9fc7c601b99daed714b7618e701bb

7 years agoMerge "Add android.os.VintfRuntimeInfo"
Treehugger Robot [Sat, 29 Apr 2017 03:00:06 +0000 (03:00 +0000)]
Merge "Add android.os.VintfRuntimeInfo"

7 years agoAdd android.os.VintfRuntimeInfo
Yifan Hong [Wed, 26 Apr 2017 18:38:01 +0000 (11:38 -0700)]
Add android.os.VintfRuntimeInfo

This is the Java API for ::android::vintf::RuntimeInfo.
This will be used by CTS for device info report purposes.

Bug: 28656227
Test: cts-tradefed run cts -m CtsEdiHostTestCases --skip-preconditions
Change-Id: Id87c95a17e77d7ec1794a6f850de97edf9ae892d

7 years agoMerge "Aapt2: Fix png leak" am: f62e38583a
Andreas Gampe [Fri, 28 Apr 2017 23:04:23 +0000 (23:04 +0000)]
Merge "Aapt2: Fix png leak" am: f62e38583a
am: 5d4c38c637

Change-Id: I0a14e885d6e2cf886b9e87f395ffa5a600ef7f28

7 years agoMerge "Aapt2: Fix png leak"
Andreas Gampe [Fri, 28 Apr 2017 22:57:50 +0000 (22:57 +0000)]
Merge "Aapt2: Fix png leak"
am: f62e38583a

Change-Id: I902d6350fa90ebb18b49c3abe6050cfe5471dbb7

7 years agoMerge "Aapt2: Fix png leak"
Andreas Gampe [Fri, 28 Apr 2017 22:45:25 +0000 (22:45 +0000)]
Merge "Aapt2: Fix png leak"

7 years agoMerge "eMBMS API update" am: 99b21ccb34
Hall Liu [Fri, 28 Apr 2017 22:32:52 +0000 (22:32 +0000)]
Merge "eMBMS API update" am: 99b21ccb34
am: 6b4841d116

Change-Id: I54ea1661b0d7a341ea94c3a2348d1e6233fd0d80

7 years agoMerge "eMBMS API update"
Hall Liu [Fri, 28 Apr 2017 22:25:53 +0000 (22:25 +0000)]
Merge "eMBMS API update"
am: 99b21ccb34

Change-Id: Ic459910f1a06979cf8e1813d18400236eeb1ad49

7 years agoMerge "eMBMS API update"
Hall Liu [Fri, 28 Apr 2017 22:17:50 +0000 (22:17 +0000)]
Merge "eMBMS API update"

7 years agoMerge "Bluetooth: bluetooth.le API fixes" am: cf95973276
Jakub Pawlowski [Fri, 28 Apr 2017 21:55:50 +0000 (21:55 +0000)]
Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276
am: 6af9bde898

Change-Id: I20d885ee7f12821885767a13cafac6c3dec4ba2d

7 years agoMerge "Bluetooth: bluetooth.le API fixes"
Jakub Pawlowski [Fri, 28 Apr 2017 21:46:14 +0000 (21:46 +0000)]
Merge "Bluetooth: bluetooth.le API fixes"
am: cf95973276

Change-Id: I67075df5e7d457cd85b40faefb3fe68946775330

7 years agoMerge "Bluetooth: bluetooth.le API fixes"
Jakub Pawlowski [Fri, 28 Apr 2017 21:36:10 +0000 (21:36 +0000)]
Merge "Bluetooth: bluetooth.le API fixes"

7 years agoBluetooth: bluetooth.le API fixes
Jakub Pawlowski [Fri, 28 Apr 2017 11:11:26 +0000 (04:11 -0700)]
Bluetooth: bluetooth.le API fixes

Fix minor spelling problems.
Throw IllegalStateException instead of IllegalArgumentException in
build().

Bug: 37532634
Test: none
Change-Id: I73b6f04aec98f5baffb06a363e2a3f71e8cec3c4

7 years agoAapt2: Fix png leak
Andreas Gampe [Fri, 28 Apr 2017 20:51:39 +0000 (13:51 -0700)]
Aapt2: Fix png leak

do9Patch is leaking two rows of data.

Bug: 37782695
Test: ASAN_OPTIONS= SANITIZE_HOST=address m
Change-Id: Ibd2198919cd9c24f2de9f50b23c87753f2190708

7 years agoMerge "Fix equality method implementation in BandConfig class." am: 30a34ec0e2
Tomasz Wasilczyk [Fri, 28 Apr 2017 20:25:43 +0000 (20:25 +0000)]
Merge "Fix equality method implementation in BandConfig class." am: 30a34ec0e2
am: 5acbf70872

Change-Id: I57e6fa0f946f25048da1524f07fa4eb13fdb2f1c

7 years agoMerge "Fix equality method implementation in BandConfig class."
Tomasz Wasilczyk [Fri, 28 Apr 2017 20:19:11 +0000 (20:19 +0000)]
Merge "Fix equality method implementation in BandConfig class."
am: 30a34ec0e2

Change-Id: I15d46cb69410efdc369d628f1681a880c1420d9d

7 years agoMerge "Fix equality method implementation in BandConfig class."
Tomasz Wasilczyk [Fri, 28 Apr 2017 20:09:03 +0000 (20:09 +0000)]
Merge "Fix equality method implementation in BandConfig class."

7 years agoMerge "better defualt behaviour for msim" am: fd810d8727
fionaxu [Fri, 28 Apr 2017 20:03:56 +0000 (20:03 +0000)]
Merge "better defualt behaviour for msim" am: fd810d8727
am: 6512f5eb10

Change-Id: Iedf27158b48f606a1f24e8780f98c3399e3337c7

7 years agoMerge "better defualt behaviour for msim"
fionaxu [Fri, 28 Apr 2017 19:53:38 +0000 (19:53 +0000)]
Merge "better defualt behaviour for msim"
am: fd810d8727

Change-Id: I242527153b768879acd1c105e69de5672678b006

7 years agoMerge "better defualt behaviour for msim"
Treehugger Robot [Fri, 28 Apr 2017 19:44:49 +0000 (19:44 +0000)]
Merge "better defualt behaviour for msim"

7 years agoMerge "Add sort order extra for phoneaccount" am: 78d3f9e1f5
Tyler Gunn [Fri, 28 Apr 2017 18:18:11 +0000 (18:18 +0000)]
Merge "Add sort order extra for phoneaccount" am: 78d3f9e1f5
am: bd4140a945

Change-Id: I541d0bf6c370b952e0e725960187e55ecc9e9ac7

7 years agoMerge "Updated javadocs for sendUssd APIs." am: 763ff42a69
Chen Xu [Fri, 28 Apr 2017 18:12:21 +0000 (18:12 +0000)]
Merge "Updated javadocs for sendUssd APIs." am: 763ff42a69
am: 85f2654bb7

Change-Id: I5231b118c7cc0ce815b4e7f6c253a85c9d9fd929

7 years agoMerge "Add sort order extra for phoneaccount"
Tyler Gunn [Fri, 28 Apr 2017 18:09:34 +0000 (18:09 +0000)]
Merge "Add sort order extra for phoneaccount"
am: 78d3f9e1f5

Change-Id: I7352b5c26122a2cda79687544d314c35c0a8d769

7 years agoMerge "Update VVM API" am: ac29d38623
Chen Xu [Fri, 28 Apr 2017 18:04:42 +0000 (18:04 +0000)]
Merge "Update VVM API" am: ac29d38623
am: fe7e5970ac

Change-Id: I4f6ba7b3edd16cf63a6039b9da34db1a9c48cdec

7 years agoMerge "Add sort order extra for phoneaccount"
Tyler Gunn [Fri, 28 Apr 2017 17:58:43 +0000 (17:58 +0000)]
Merge "Add sort order extra for phoneaccount"

7 years agoMerge "Updated javadocs for sendUssd APIs."
Chen Xu [Fri, 28 Apr 2017 17:57:29 +0000 (17:57 +0000)]
Merge "Updated javadocs for sendUssd APIs."
am: 763ff42a69

Change-Id: I9a7fd10b652bdbc43b3a171229815f99dfbf8e97

7 years agoMerge "Update VVM API"
Chen Xu [Fri, 28 Apr 2017 17:55:07 +0000 (17:55 +0000)]
Merge "Update VVM API"
am: ac29d38623

Change-Id: Iec4b0f3cb89b49902aeeb7a044fbab0a98ba9e3e

7 years agoAdd sort order extra for phoneaccount
Srikanth Chintala [Mon, 27 Mar 2017 13:57:52 +0000 (19:27 +0530)]
Add sort order extra for phoneaccount

Add sort order extra for phoneaccount
which will be used while sorting
phone accounts in Telecomm

Test: Manual
Bug: 34872161
Merged-In: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc
Change-Id: I268d2250cc9bcd1a5e9eb8be99dcb23e2bcceadc

7 years agobetter defualt behaviour for msim
fionaxu [Thu, 6 Apr 2017 17:31:48 +0000 (10:31 -0700)]
better defualt behaviour for msim

switch behaviour for the default case based on caller's context,
some API prefer defaultDataId while others prefer
defaultVoiceId/DefaultSmsId.

Bug: 36818721
Change-Id: Icf8053258f8a95a0b16eb5cf59ec05c0c400ae7a
Merged-in: Icf8053258f8a95a0b16eb5cf59ec05c0c400ae7a

7 years agoMerge "Updated javadocs for sendUssd APIs."
Chen Xu [Fri, 28 Apr 2017 17:26:11 +0000 (17:26 +0000)]
Merge "Updated javadocs for sendUssd APIs."

7 years agoMerge "Update VVM API"
Chen Xu [Fri, 28 Apr 2017 17:25:53 +0000 (17:25 +0000)]
Merge "Update VVM API"

7 years agoFix equality method implementation in BandConfig class.
Tomasz Wasilczyk [Fri, 28 Apr 2017 15:19:34 +0000 (08:19 -0700)]
Fix equality method implementation in BandConfig class.

Test: instrumentation (in master branch)
Bug: b/36863239
Change-Id: I2f3b68ba3fac75b849ee99dc06d0a13478168b7e

7 years agoMerge "Validate incoming data properly." am: 5718b01b9a
Martijn Coenen [Fri, 28 Apr 2017 14:44:47 +0000 (14:44 +0000)]
Merge "Validate incoming data properly." am: 5718b01b9a
am: 4fcfe05707

Change-Id: I129a3e6c1b401448c075cd63c5396914bfb67fd7

7 years agoMerge "Validate incoming data properly."
Martijn Coenen [Fri, 28 Apr 2017 14:38:26 +0000 (14:38 +0000)]
Merge "Validate incoming data properly."
am: 5718b01b9a

Change-Id: I6b2badb1b075c1eb8d8e9d1e25397fc41ab1aae3

7 years agoMerge "Validate incoming data properly."
Martijn Coenen [Fri, 28 Apr 2017 14:32:54 +0000 (14:32 +0000)]
Merge "Validate incoming data properly."

7 years agoMerge "Notify WifiManager of interface state changes" am: 8e97274186
Erik Kline [Fri, 28 Apr 2017 08:11:04 +0000 (08:11 +0000)]
Merge "Notify WifiManager of interface state changes" am: 8e97274186
am: 241a7f15f2

Change-Id: I4360a558181624004a88074da92b3bbf202a6a18

7 years agoMerge "Notify WifiManager of interface state changes"
Erik Kline [Fri, 28 Apr 2017 08:04:31 +0000 (08:04 +0000)]
Merge "Notify WifiManager of interface state changes"
am: 8e97274186

Change-Id: I6e9594805f9f55da53cf29e322829b1d2ff2f058

7 years agoMerge "Notify WifiManager of interface state changes"
Treehugger Robot [Fri, 28 Apr 2017 07:55:47 +0000 (07:55 +0000)]
Merge "Notify WifiManager of interface state changes"

7 years agoNotify WifiManager of interface state changes
Erik Kline [Thu, 27 Apr 2017 11:57:23 +0000 (20:57 +0900)]
Notify WifiManager of interface state changes

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passes
      (except for an unrelated IpConnectivityMetricsTest error)
Bug: 31466854
Bug: 32163131
Change-Id: I702ea79eb2c02604761e4e1ebcd5f9e445178efb

7 years agoeMBMS API update
Hall Liu [Tue, 25 Apr 2017 22:04:26 +0000 (15:04 -0700)]
eMBMS API update

Brings eMBMS APIs into alignment with the architecture doc.
All APIs are hidden for now.

Test: builds
Change-Id: I6e692bd363f998d1cd8f80faa72bde71ffe8fd2e

7 years agoAdd logging around dream start/stop am: 4769b54d49
Erik Wolsheimer [Thu, 27 Apr 2017 23:48:51 +0000 (23:48 +0000)]
Add logging around dream start/stop am: 4769b54d49
am: b50a0cdd5e

Change-Id: I8b658faa9eac7c448c0e37cc81d93775ecb4c8d7

7 years agoUpdate VVM API
Ta-wei Yen [Mon, 6 Mar 2017 22:57:47 +0000 (14:57 -0800)]
Update VVM API

+ TelephonyManager.getVisualVoicemailPackageName() uses pinned subId
  from the manager.
+ TelephonyManager.getNetworkSpecifier() updated doc to explain what
  a network specifier is.
+ TelephonyManager.getCarrierConfig() Annotated with @WorkerThread
  specified failure behavior.
+ VisualVoicemailSms.getFields() Doc specified values are carrier
  dependent.

- Hide DEFAULT_* from VisualVociemaliSmsFitelrSettings

Test: CTS TelephonyManagerTest
Bug: 35766748
Fixes: 35766370
Fixes: 35766489
Change-Id: If48d48a0cf588bcb59c7b77ce6a452d2fda7bfa5
Merged-in: If48d48a0cf588bcb59c7b77ce6a452d2fda7bfa5

7 years agoAdd logging around dream start/stop
Erik Wolsheimer [Thu, 27 Apr 2017 23:43:19 +0000 (23:43 +0000)]
Add logging around dream start/stop
am: 4769b54d49

Change-Id: If77de68a0c775b32b6df7e95462f698efc2f84ee

7 years agoValidate incoming data properly.
Martijn Coenen [Tue, 18 Apr 2017 22:54:43 +0000 (15:54 -0700)]
Validate incoming data properly.

Make sure calls to readBuffer() and readEmbeddedBuffer()
get the correct size, parent and offset passed in, so
these can be validated by libhwbinder.

Modified HwBlob to take a length argument as well,
so it can be validated.

Bug: 30498700
Test: hidl_test, hidl_test_java, Youtube, Maps, Netflix, Camera
Change-Id: I28712db97ae29b46acfe952d3d92d1ce5f666a4d
Merged-In: I28712db97ae29b46acfe952d3d92d1ce5f666a4d

7 years agoMerge "new reset carrier signals/actions" am: 5bd39aaf42
fionaxu [Thu, 27 Apr 2017 23:02:23 +0000 (23:02 +0000)]
Merge "new reset carrier signals/actions" am: 5bd39aaf42
am: dc31a45517

Change-Id: I59b456a4e849900080cc0564b096e6dacf7070ae

7 years agoMerge "new reset carrier signals/actions"
fionaxu [Thu, 27 Apr 2017 22:57:30 +0000 (22:57 +0000)]
Merge "new reset carrier signals/actions"
am: 5bd39aaf42

Change-Id: I503cd2c7d7ca63d9668995319d4876a39fc91666

7 years agoMerge "new reset carrier signals/actions"
Treehugger Robot [Thu, 27 Apr 2017 22:48:07 +0000 (22:48 +0000)]
Merge "new reset carrier signals/actions"

7 years agoMerge "Merge "Bluetooth: Add constants to ScanResult" am: 369a94496c" into stage...
Jakub Pawlowski [Thu, 27 Apr 2017 22:42:18 +0000 (22:42 +0000)]
Merge "Merge "Bluetooth: Add constants to ScanResult" am: 369a94496c" into stage-aosp-master
am: c6c9508f8a

Change-Id: I8876af2e00e6a52629a47c1ef7c26f4c674e5de8

7 years agoMerge "Merge "Bluetooth: Add constants to ScanResult" am: 369a94496c" into stage...
Android Build Merger (Role) [Thu, 27 Apr 2017 22:38:39 +0000 (22:38 +0000)]
Merge "Merge "Bluetooth: Add constants to ScanResult" am: 369a94496c" into stage-aosp-master

7 years agoMerge "Bluetooth: Add constants to ScanResult"
Jakub Pawlowski [Thu, 27 Apr 2017 22:35:15 +0000 (22:35 +0000)]
Merge "Bluetooth: Add constants to ScanResult"
am: 369a94496c

Change-Id: I6fbd113aa163a0941e95b6517f3819d1d68a3342

7 years agoMerge "Bluetooth: Add constants to ScanResult" am: 369a94496c
Jakub Pawlowski [Thu, 27 Apr 2017 22:33:14 +0000 (22:33 +0000)]
Merge "Bluetooth: Add constants to ScanResult" am: 369a94496c
am: b6656f07e7

Change-Id: I29f06e5c612e29ae25bde0e3e8854bf88213b65d

7 years agoMerge "Bluetooth: Add constants to ScanResult"
Jakub Pawlowski [Thu, 27 Apr 2017 22:26:27 +0000 (22:26 +0000)]
Merge "Bluetooth: Add constants to ScanResult"
am: 369a94496c

Change-Id: I9de3466936fd66afd973aa84003202c96aebec32

7 years agoMerge "Bluetooth: Add constants to ScanResult"
Jakub Pawlowski [Thu, 27 Apr 2017 22:12:57 +0000 (22:12 +0000)]
Merge "Bluetooth: Add constants to ScanResult"

7 years agoAdd logging around dream start/stop
Erik Wolsheimer [Thu, 27 Apr 2017 21:32:46 +0000 (14:32 -0700)]
Add logging around dream start/stop

Bug: 28455483
Change-Id: I31d4d52c3ed4cbfc6f6a9d978fd2669224ba95b4

7 years agonew reset carrier signals/actions
fionaxu [Wed, 26 Apr 2017 23:05:25 +0000 (16:05 -0700)]
new reset carrier signals/actions

- new carrier signal intended for notifying carrier apps that all
carrier actions has been reset due to sim load/absent.
- default carrier apps clean up UI on reset actions.

Bug: 34626476
Test: Manual test on TMO and ZIP SIM
Change-Id: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050
Merged-in: I232dd19294e99fb0a7d53ca1b5c049e6e3e2e050

7 years agoBluetooth: Add constants to ScanResult
Jakub Pawlowski [Thu, 27 Apr 2017 15:37:04 +0000 (08:37 -0700)]
Bluetooth: Add constants to ScanResult

Add TX_POWER_NOT_PRESENT and PERIODIC_INTERVAL_NOT_PRESENT

Test: none
Bug: 37536707
Change-Id: Ia48a30f44a961c6e0babd17ecaed0eb93c98ecad

7 years agoUpdated javadocs for sendUssd APIs.
pkanwar [Mon, 20 Mar 2017 19:23:42 +0000 (12:23 -0700)]
Updated javadocs for sendUssd APIs.

Bug: 35766546
Change-Id: I40f0addc15331184b3409b3d1b5c9dc1455d8b5b
Merged-in: I40f0addc15331184b3409b3d1b5c9dc1455d8b5b
Test: manual

7 years agoMerge "Fix NPE when accessing mCallback in BluetoothGatt" am: 1be8fb23eb
Jakub Pawlowski [Thu, 27 Apr 2017 19:56:09 +0000 (19:56 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt" am: 1be8fb23eb
am: 28f182aa87

Change-Id: I85f4847b7c530bded24dcb27faa851ed9b5ba653

7 years agoMerge "Fix NPE when accessing mCallback in BluetoothGatt"
Jakub Pawlowski [Thu, 27 Apr 2017 19:46:06 +0000 (19:46 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt"
am: 1be8fb23eb

Change-Id: I764b7a169e5acabef07fafc43367040d8d493d7b

7 years agoMerge "Fix NPE when accessing mCallback in BluetoothGatt"
Treehugger Robot [Thu, 27 Apr 2017 19:37:53 +0000 (19:37 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt"

7 years agoFix NPE when accessing mCallback in BluetoothGatt
Jakub Pawlowski [Thu, 27 Apr 2017 14:04:15 +0000 (07:04 -0700)]
Fix NPE when accessing mCallback in BluetoothGatt

This issue was introduced in commit
4eab49652e48159fd37f827d30b822f2f187551e.

Bug: 37710354
Test: none
Change-Id: I2d985ce97c44d4e096713e156e57437f44ea3ddb

7 years agoMerge "Rename getDataEnabled() to isDataEnabled()." am: 4898b704de
Jeff Davidson [Thu, 27 Apr 2017 18:27:00 +0000 (18:27 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()." am: 4898b704de
am: 0b79745dd1

Change-Id: Id9d1f415a386238e6357f5952f78e395ee034bd2

7 years agoMerge "Rename getDataEnabled() to isDataEnabled()."
Jeff Davidson [Thu, 27 Apr 2017 18:17:28 +0000 (18:17 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()."
am: 4898b704de

Change-Id: Ic11d6568aac8cdad151c61fa32d4535ccea9f53b

7 years agoMerge "Add getVisualVoicemailPackageName()" am: 998eb212bd
Chen Xu [Thu, 27 Apr 2017 18:07:30 +0000 (18:07 +0000)]
Merge "Add getVisualVoicemailPackageName()" am: 998eb212bd
am: 2eae7bfc03

Change-Id: I86cec4ba1f4cbc86fa84dc9d036542bebcc93100