OSDN Git Service
Brian Duddie [Mon, 17 Apr 2017 21:46:51 +0000 (21:46 +0000)]
Merge "ContextHubService: Pass on query requests" into oc-dev am:
befd33975c
am:
2f23a1a7a1
Change-Id: I3392ad2be1113bf69381e0c7f108bb9ca1a59492
Selim Cinek [Mon, 17 Apr 2017 21:45:43 +0000 (21:45 +0000)]
Merge changes I22b55b73,Id050f2f5 into oc-dev am:
d8d7a283bd
am:
324b399798
Change-Id: I1b8d5eb716a80f26370e3e46d587a9a4922c343e
Adrian Roos [Mon, 17 Apr 2017 21:44:31 +0000 (21:44 +0000)]
Merge "AOD: Fix icon color when updating on AOD" into oc-dev am:
f0111ce8b6
am:
7b9bff257b
Change-Id: Ib2fdd178c0de90221a460cd1839de56ff02ed1dc
Dianne Hackborn [Mon, 17 Apr 2017 21:43:16 +0000 (21:43 +0000)]
Merge "Merge "Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED" into oc-dev am:
e15f91276c" into oc-dev-plus-aosp
am:
7c024fd5eb -s ours
Change-Id: I71e3341621ef9b07dce887d8cea99bd55b16f9b9
Jordan Liu [Mon, 17 Apr 2017 21:41:01 +0000 (21:41 +0000)]
Merge "Update api for ServiceStateProvider" am:
286b5f117d am:
ea4a67ddd1 am:
56a13d1bce
am:
e08f67f2ad -s ours
Change-Id: Ia45e9c4a001f1de182e60970791919c1014431a2
Fan Zhang [Mon, 17 Apr 2017 21:37:16 +0000 (21:37 +0000)]
Merge "Remove FrameLayout around toolbar" into oc-dev am:
46f6e69e1b
am:
215cc7914e
Change-Id: I1dc55a1529803cd2b4c930c79fd110051b5b3a8c
TreeHugger Robot [Mon, 17 Apr 2017 21:35:17 +0000 (21:35 +0000)]
Merge "resolve merge conflicts of
2439e19d4127 to master"
Qingxi Li [Mon, 17 Apr 2017 20:59:06 +0000 (20:59 +0000)]
Merge "Add disable carrier button for eSIM"
Romain Guy [Mon, 17 Apr 2017 19:31:09 +0000 (12:31 -0700)]
resolve merge conflicts of
2439e19d4127 to master
Test: built locally
Change-Id: Idc922c7fa3306e6884b88c79e73f5375d8e65888
TreeHugger Robot [Mon, 17 Apr 2017 19:22:43 +0000 (19:22 +0000)]
Merge "EUICC API changes to support error resolution."
Brian Duddie [Mon, 17 Apr 2017 19:01:57 +0000 (19:01 +0000)]
Merge "ContextHubService: Pass on query requests" into oc-dev
am:
befd33975c
Change-Id: Id27aa1ec7d76e6f74a0f436ba5f8bd1643991f6e
Selim Cinek [Mon, 17 Apr 2017 19:00:28 +0000 (19:00 +0000)]
Merge changes I22b55b73,Id050f2f5 into oc-dev
am:
d8d7a283bd
Change-Id: Ia147e09d7974c2a4f810ee0df04c602be1760be4
Adrian Roos [Mon, 17 Apr 2017 18:59:20 +0000 (18:59 +0000)]
Merge "AOD: Fix icon color when updating on AOD" into oc-dev
am:
f0111ce8b6
Change-Id: Ie554c41a43c2a311d217a35fe96a6b81b56ceac6
TreeHugger Robot [Mon, 17 Apr 2017 18:51:43 +0000 (18:51 +0000)]
Merge "ContextHubService: Pass on query requests" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 18:51:01 +0000 (18:51 +0000)]
Merge changes I22b55b73,Id050f2f5 into oc-dev
* changes:
Only foreground service notifications can be colorized
Fixed a regression where the scrim would be black
Adrian Roos [Mon, 17 Apr 2017 18:48:37 +0000 (18:48 +0000)]
Merge "AOD: Fix icon color when updating on AOD" into oc-dev
Android Build Merger (Role) [Mon, 17 Apr 2017 18:45:54 +0000 (18:45 +0000)]
Merge "Merge "Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED" into oc-dev am:
e15f91276c" into oc-dev-plus-aosp
Dianne Hackborn [Mon, 17 Apr 2017 18:44:58 +0000 (18:44 +0000)]
Merge "Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED" into oc-dev
am:
e15f91276c
Change-Id: Iacccbcc734d5c49f483923c00625a49ad1d280a5
Jordan Liu [Mon, 17 Apr 2017 18:44:01 +0000 (18:44 +0000)]
Merge "Update api for ServiceStateProvider" am:
286b5f117d am:
ea4a67ddd1
am:
56a13d1bce
Change-Id: I8797fca65daa01ad86118b5f548a800e1854769c
TreeHugger Robot [Mon, 17 Apr 2017 18:38:57 +0000 (18:38 +0000)]
Merge "Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED" into oc-dev
Fan Zhang [Mon, 17 Apr 2017 18:37:45 +0000 (18:37 +0000)]
Merge "Remove FrameLayout around toolbar" into oc-dev
am:
46f6e69e1b
Change-Id: I2129c87b83a2346feff73cffcf26a2359f84e197
Romain Guy [Mon, 17 Apr 2017 18:33:23 +0000 (18:33 +0000)]
Merge "Properly decode colors spaces in BitmapRegionDecoder" into oc-dev
am:
5b52cf6274
Change-Id: I86284be4dc506b6f4243ae27c4df848d874ca912
TreeHugger Robot [Mon, 17 Apr 2017 18:25:48 +0000 (18:25 +0000)]
Merge "Remove FrameLayout around toolbar" into oc-dev
Jordan Liu [Mon, 17 Apr 2017 18:21:56 +0000 (18:21 +0000)]
Merge "Update api for ServiceStateProvider" am:
286b5f117d
am:
ea4a67ddd1
Change-Id: Ib0ac43e24dbd4b1c0f037f6f3f3bc81b9acbae62
TreeHugger Robot [Mon, 17 Apr 2017 18:20:10 +0000 (18:20 +0000)]
Merge "Properly decode colors spaces in BitmapRegionDecoder" into oc-dev
Jordan Liu [Mon, 17 Apr 2017 18:14:23 +0000 (18:14 +0000)]
Merge "Update api for ServiceStateProvider"
am:
286b5f117d
Change-Id: I8404dad9be43a0ea41a973d289014a4fe1529ab3
Jaewan Kim [Mon, 17 Apr 2017 18:11:06 +0000 (18:11 +0000)]
Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev am:
bde4eb5bcb
am:
6b2d5be466
Change-Id: I3d542488d089b926662644d124098ca229fa5450
Tyler Gunn [Mon, 17 Apr 2017 18:09:20 +0000 (18:09 +0000)]
Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev am:
790ec07c26
am:
e935b6e544 -s ours
Change-Id: Icd8f538d2cd20ead660376ca7bd7f2fbf6348aea
Treehugger Robot [Mon, 17 Apr 2017 18:05:02 +0000 (18:05 +0000)]
Merge "Update api for ServiceStateProvider"
Jaewan Kim [Mon, 17 Apr 2017 18:00:26 +0000 (18:00 +0000)]
Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev
am:
bde4eb5bcb
Change-Id: I0b81c971b5b466e967b8255cfc400c780c9078ba
Tyler Gunn [Mon, 17 Apr 2017 17:58:49 +0000 (17:58 +0000)]
Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev
am:
790ec07c26
Change-Id: I6f5294d93d11d72b2d14795b22757e68259b0c95
TreeHugger Robot [Mon, 17 Apr 2017 17:53:15 +0000 (17:53 +0000)]
Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev
Chris Tate [Mon, 17 Apr 2017 17:52:21 +0000 (17:52 +0000)]
Merge "Don't back up disabled apps" into oc-dev am:
628690ea2b
am:
281def0704
Change-Id: Ibbb8403bdf68d6a55b67ee361b578e2aa767bb42
Rebecca Silberstein [Mon, 17 Apr 2017 17:50:44 +0000 (17:50 +0000)]
Merge "Merge "WifiManager: add new methods to start softap" am:
be2653d41e am:
334fe54661 am:
2dda9f5d66" into oc-dev-plus-aosp
am:
a7cba48907
Change-Id: Id27920b3012adde075cfc270b14b5378037913c0
Yoshinori Hirano [Mon, 17 Apr 2017 17:49:23 +0000 (17:49 +0000)]
Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev am:
1afa1646a2
am:
8a323ab65f
Change-Id: I7003321f7d5a66ec73d0e7f7765be3135a06536e
Chris Tate [Mon, 17 Apr 2017 17:44:18 +0000 (17:44 +0000)]
Merge "Don't back up disabled apps" into oc-dev
am:
628690ea2b
Change-Id: If8008f3c14bdb12dee5e400ce96394e1f541f462
Android Build Merger (Role) [Mon, 17 Apr 2017 17:41:06 +0000 (17:41 +0000)]
Merge "Merge "WifiManager: add new methods to start softap" am:
be2653d41e am:
334fe54661 am:
2dda9f5d66" into oc-dev-plus-aosp
Tyler Gunn [Mon, 17 Apr 2017 17:40:44 +0000 (17:40 +0000)]
Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev
Rebecca Silberstein [Mon, 17 Apr 2017 17:39:55 +0000 (17:39 +0000)]
Merge "WifiManager: add new methods to start softap" am:
be2653d41e am:
334fe54661
am:
2dda9f5d66
Change-Id: Ie2476bbae3554bd9fc203c478d25cb2e2898c8e3
Yoshinori Hirano [Mon, 17 Apr 2017 17:39:45 +0000 (17:39 +0000)]
Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev
am:
1afa1646a2
Change-Id: I2cf920ba553587c4da04a1f1973a15d48c89ed80
Tyler Gunn [Fri, 14 Apr 2017 20:43:30 +0000 (13:43 -0700)]
DO NOT MERGE Expose phone account register/unregister intents.
These were previously @SystemApi. Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.
Cherry-pick from aosp-master to resolve merge conflicts.
Test: Manual
Bug:
37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
(cherry picked from commit
d9da6ce9938b4222cfb409f172cacfe4cf1593e6)
Chris Tate [Mon, 17 Apr 2017 17:35:46 +0000 (17:35 +0000)]
Merge "Don't back up disabled apps" into oc-dev
Rebecca Silberstein [Mon, 17 Apr 2017 17:30:08 +0000 (17:30 +0000)]
Merge "WifiManager: add new methods to start softap" am:
be2653d41e
am:
334fe54661
Change-Id: I3e0455020c5b0c1896c1994a821832e0e45ae4e6
TreeHugger Robot [Mon, 17 Apr 2017 17:28:33 +0000 (17:28 +0000)]
Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev
Rebecca Silberstein [Mon, 17 Apr 2017 17:20:42 +0000 (17:20 +0000)]
Merge "WifiManager: add new methods to start softap"
am:
be2653d41e
Change-Id: Ic73c0b8f52c86f00a6d03687b37b4c02f41d4fcc
Hangyu Kuang [Mon, 17 Apr 2017 17:20:20 +0000 (17:20 +0000)]
Merge "media: Address API review comments" into oc-dev am:
ab312729ce
am:
bde6da6f18
Change-Id: Ic22500200177a43874dbbd5a4fb327a8c9a7d25f
Andrii Kulian [Mon, 17 Apr 2017 17:17:19 +0000 (17:17 +0000)]
Merge "Temporary remove resource-display caching" into oc-dev am:
8f4bd67929
am:
8063101678
Change-Id: I1ca01d912880b629b67a25a2a03e257f35a83400
Bryce Lee [Mon, 17 Apr 2017 17:16:09 +0000 (17:16 +0000)]
Merge "Don't allow stacks above pinned stack." into oc-dev am:
22d4ef008d
am:
e7ac364ae1
Change-Id: I2c8daf0f23090fedf2ed0b24f743a50efd4d3a54
Hangyu Kuang [Mon, 17 Apr 2017 17:13:17 +0000 (17:13 +0000)]
Merge "media: Address API review comments" into oc-dev
am:
ab312729ce
Change-Id: Ie957c8c197ff2459cbc5d32c1716d78d0752ddbe
TreeHugger Robot [Mon, 17 Apr 2017 17:11:27 +0000 (17:11 +0000)]
Merge "use sk_sp to manage colortables"
Rebecca Silberstein [Mon, 17 Apr 2017 17:10:37 +0000 (17:10 +0000)]
Merge "WifiManager: add new methods to start softap"
Andrii Kulian [Mon, 17 Apr 2017 17:08:29 +0000 (17:08 +0000)]
Merge "Temporary remove resource-display caching" into oc-dev
am:
8f4bd67929
Change-Id: I26ead23b26bd5ed50804cb5edf0ca15d10303eb5
Bryce Lee [Mon, 17 Apr 2017 17:07:09 +0000 (17:07 +0000)]
Merge "Don't allow stacks above pinned stack." into oc-dev
am:
22d4ef008d
Change-Id: I740f62046d5f37a634e8c656ee76a82ecb244ff1
Hangyu Kuang [Mon, 17 Apr 2017 17:04:17 +0000 (17:04 +0000)]
Merge "media: Address API review comments" into oc-dev
Dianne Hackborn [Mon, 17 Apr 2017 17:02:54 +0000 (17:02 +0000)]
Merge "Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED"
Andrii Kulian [Mon, 17 Apr 2017 16:59:56 +0000 (16:59 +0000)]
Merge "Temporary remove resource-display caching" into oc-dev
Bryce Lee [Mon, 17 Apr 2017 16:57:11 +0000 (16:57 +0000)]
Merge "Don't allow stacks above pinned stack." into oc-dev
Andrii Kulian [Mon, 17 Apr 2017 02:28:02 +0000 (19:28 -0700)]
Temporary remove resource-display caching
An instance of ResourceKey may correspond to different instances
of Resources at different points in time. This can lead to old
instances of Display returned from cache even if resources have
changed.
We need to ensure 1:1 correspondence between Resources and
ResourceKey before using this kind of cache. Disabling it for now
to fix CTS.
Change-Id: Ib53550c4f2d969c06a570ab6051529269b04b38d
Fixes:
37328072
Fixes:
37305567
Bug:
33430498
Test: android.server.cts.ActivityManagerAppConfigurationTests
Test: android.app.cts.DisplayTest#testRotation
Android Build Merger (Role) [Mon, 17 Apr 2017 16:53:27 +0000 (16:53 +0000)]
Merge "Merge "Synchronously update APs in during forceUpdate." into oc-dev am:
6bdbc4abec am:
17bc64597c"
Jordan Liu [Mon, 17 Apr 2017 16:53:09 +0000 (16:53 +0000)]
Merge "Update api for ServiceStateProvider"
Sundeep Ghuman [Mon, 17 Apr 2017 16:52:31 +0000 (16:52 +0000)]
Merge "Synchronously update APs in during forceUpdate." into oc-dev am:
6bdbc4abec
am:
17bc64597c
Change-Id: I02b3ff391b10ed1f2ced5b7149c77b68b90fa63e
Sundeep Ghuman [Mon, 17 Apr 2017 16:42:31 +0000 (16:42 +0000)]
Merge "Synchronously update APs in during forceUpdate." into oc-dev
am:
6bdbc4abec
Change-Id: Ib98d02c5e40de0f245fb303041a665b8ade6a4f3
Julia Reynolds [Mon, 17 Apr 2017 16:42:07 +0000 (16:42 +0000)]
Merge "Also use the notification's sound for the misc channel" into oc-dev am:
ed8f49efdc
am:
f6ca4cfcd2
Change-Id: I195ac4a4006cfc746b784f4f99d6fe42c93e40af
TreeHugger Robot [Mon, 17 Apr 2017 16:34:49 +0000 (16:34 +0000)]
Merge "Synchronously update APs in during forceUpdate." into oc-dev
Julia Reynolds [Mon, 17 Apr 2017 16:33:11 +0000 (16:33 +0000)]
Merge "Also use the notification's sound for the misc channel" into oc-dev
am:
ed8f49efdc
Change-Id: I268e2702a6fbe714276f38581493ef2a089007e8
Fan Zhang [Fri, 14 Apr 2017 19:27:18 +0000 (12:27 -0700)]
Remove FrameLayout around toolbar
The FrameLayout is useless, and cause problems if dev needs to customize
actionbar in code.
Change-Id: Iae6861e1e60576f4b4e175d01c7cd57c0775ecd7
Fix:
37207527
Test: visual
TreeHugger Robot [Mon, 17 Apr 2017 16:23:49 +0000 (16:23 +0000)]
Merge "Also use the notification's sound for the misc channel" into oc-dev
Yoshinori Hirano [Mon, 10 Apr 2017 11:33:49 +0000 (20:33 +0900)]
Fix EmergencyCryptKeeperText initialization
Moved the initialization to CollapsedStatusBarFragment
because EmergencyCryptKepperText is included in status_bar.xml
Bug:
37198942
Test: visual
Change-Id: I1b87e4857cea7f7b582f7e0f6062b70da98df13a
Julia Reynolds [Mon, 17 Apr 2017 15:17:48 +0000 (15:17 +0000)]
Merge "Remove @removed method" into oc-dev am:
bbcf5fba1c
am:
211d99d1b9
Change-Id: I9400d1f49af2e35771d402f2879c85e29e4604f0
Julia Reynolds [Mon, 17 Apr 2017 15:09:24 +0000 (15:09 +0000)]
Merge "Remove @removed method" into oc-dev
am:
bbcf5fba1c
Change-Id: Iae9bb928a90d172dfe74e9308a6d8283df734dc6
TreeHugger Robot [Mon, 17 Apr 2017 15:01:46 +0000 (15:01 +0000)]
Merge "Remove @removed method" into oc-dev
Julia Reynolds [Mon, 17 Apr 2017 14:31:03 +0000 (10:31 -0400)]
Also use the notification's sound for the misc channel
Even if it's nonexistent.
Test: runtest systemui-notification
Change-Id: I1167fdf10b776460de696657dd49ab6f2be85753
Fixes:
37414045
Todd Kennedy [Mon, 17 Apr 2017 14:32:38 +0000 (14:32 +0000)]
Merge "expose the instant app installer component" into oc-dev am:
676590d060
am:
8d0dacb5b1
Change-Id: Id1df099740c6e108878c8f10aacceb59b42b0041
Todd Kennedy [Mon, 17 Apr 2017 14:22:35 +0000 (14:22 +0000)]
Merge "expose the instant app installer component" into oc-dev
am:
676590d060
Change-Id: I48c05c84c2afba4bf68dfd42b834d8e6958f6744
TreeHugger Robot [Mon, 17 Apr 2017 14:17:20 +0000 (14:17 +0000)]
Merge "expose the instant app installer component" into oc-dev
Jaewan Kim [Fri, 14 Apr 2017 06:26:20 +0000 (15:26 +0900)]
TV PIP: Remove onboarding activity and overlay activity
Remove both activities until the new OC UX spec is finalized.
Bug:
36370535
Test: Manual test (Checked that onboarding nor overlay activities aren't
shown after the FDR)
Change-Id: I97c4b2038aabf4f00cac957af6b79dcd874000ae
Jaewan Kim [Mon, 17 Apr 2017 07:39:11 +0000 (07:39 +0000)]
Merge "MediaSessionService: Cache active sessions per an user" into oc-dev am:
5fc6e63e2e
am:
18a6331772
Change-Id: I854db28eaf942b8d4b6035ccc35be65bf4eee774
Jaewan Kim [Mon, 17 Apr 2017 07:29:40 +0000 (07:29 +0000)]
Merge "MediaSessionService: Cache active sessions per an user" into oc-dev
am:
5fc6e63e2e
Change-Id: I8a444b4b36fe01097dc3c4e21e0df8294ada56a1
TreeHugger Robot [Mon, 17 Apr 2017 07:20:54 +0000 (07:20 +0000)]
Merge "MediaSessionService: Cache active sessions per an user" into oc-dev
Erik Kline [Mon, 17 Apr 2017 05:29:00 +0000 (05:29 +0000)]
Merge changes I76ae853c,If94102c7 into oc-dev am:
7eb8260236
am:
feac32ced9
Change-Id: Id87d4ef2a14572c93bece1f19b3da8f73980d708
Erik Kline [Mon, 17 Apr 2017 05:19:35 +0000 (05:19 +0000)]
Merge changes I76ae853c,If94102c7 into oc-dev
am:
7eb8260236
Change-Id: I29e7e076b74842098d5de36aa965a736f1a2863c
TreeHugger Robot [Mon, 17 Apr 2017 05:11:14 +0000 (05:11 +0000)]
Merge changes I76ae853c,If94102c7 into oc-dev
* changes:
Ignore potential SystemProperties errors when setting net.dns
Make ConnectivityServiceTest pass on wifi-only devices.
Winson Chung [Mon, 17 Apr 2017 02:00:18 +0000 (02:00 +0000)]
Use vsync choreographer when moving PIP. am:
487737b876
am:
4cc5518c80
Change-Id: I43e66e892ae3e67336e18d9a55d6074bc0e75167
Winson Chung [Mon, 17 Apr 2017 01:50:43 +0000 (01:50 +0000)]
Use vsync choreographer when moving PIP.
am:
487737b876
Change-Id: Ifc6c5a57748432bf1173b27d5377ed573c70ba65
Hugo Benichi [Wed, 22 Mar 2017 08:07:57 +0000 (17:07 +0900)]
ConnectivityManager: unify prety printing of callback types.
And also remove some small code duplication (checkNotNull).
Test: built, flashed, runtest frameworks-net
Change-Id: Id6c13bca9d12f70b88806032e0a4fa198efbedc6
Winson Chung [Wed, 5 Apr 2017 21:17:08 +0000 (14:17 -0700)]
Use vsync choreographer when moving PIP.
Bug:
36371375
Test: Enter PIP, move PIP
Change-Id: I5956a3ed9e92a4cdd4bf0a55723b9f1574c1a86f
Dianne Hackborn [Fri, 14 Apr 2017 23:58:30 +0000 (16:58 -0700)]
Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED
Test: booted and ran.
Change-Id: Id972da711188177ca3ac38a22efa04c5901e7d47
Dianne Hackborn [Fri, 14 Apr 2017 23:58:30 +0000 (16:58 -0700)]
Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED
Test: booted and ran.
Change-Id: Id972da711188177ca3ac38a22efa04c5901e7d47
Merged-In: Id972da711188177ca3ac38a22efa04c5901e7d47
Romain Guy [Sun, 16 Apr 2017 04:41:22 +0000 (21:41 -0700)]
Properly decode colors spaces in BitmapRegionDecoder
Reusing a bitmap with BitmapRegionDecoder would preserve the
previous color space. This change also tweaks color space
matching to make sure we pick Display P3 with parameter d=0.039
or d=0.04045
Bug:
36905374
Test: CtsGraphicsTestCases
Change-Id: I4d2d66e5babebb0b5ce5cbdc7e8244177b4b7f9c
Tyler Gunn [Sat, 15 Apr 2017 22:35:11 +0000 (22:35 +0000)]
Merge "Expose phone account register/unregister intents." am:
24299f5b06 am:
b993a44272 am:
d046aa9103
am:
03dbae246e -s ours
Change-Id: I0b7e021287a51b71d8ac996a659fc3383445ddb3
Nathan Harold [Sat, 15 Apr 2017 22:33:43 +0000 (22:33 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am:
02278a5a02 am:
d50a325553 am:
661278432d
am:
23e6899924
Change-Id: I53c03893629be1662f3f5922011d600b19e878bf
Tyler Gunn [Sat, 15 Apr 2017 22:28:09 +0000 (22:28 +0000)]
Merge "Expose phone account register/unregister intents." am:
24299f5b06 am:
b993a44272
am:
d046aa9103
Change-Id: Iece85cdaee561d2e32c634bed2f2bc03a635450c
Nathan Harold [Sat, 15 Apr 2017 22:26:36 +0000 (22:26 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am:
02278a5a02 am:
d50a325553
am:
661278432d
Change-Id: Ie6ed56a31df7a4b9e0730693561786562eb42fc9
Rebecca Silberstein [Sat, 15 Apr 2017 20:50:00 +0000 (20:50 +0000)]
Merge "Add a default SSID prefix for local only hotspot" into oc-dev am:
d8837b6fca
am:
f7ff103c55
Change-Id: I365fb0b25e02f76c32a05217d98112a4c3241a4e
Rebecca Silberstein [Sat, 15 Apr 2017 20:42:34 +0000 (20:42 +0000)]
Merge "Add a default SSID prefix for local only hotspot" into oc-dev
am:
d8837b6fca
Change-Id: I8703b838c83a71f5be27d07e1a514bf4c8d22a17
Rebecca Silberstein [Sat, 15 Apr 2017 20:37:32 +0000 (20:37 +0000)]
Merge "Add a default SSID prefix for local only hotspot" into oc-dev
Ray Essick [Sat, 15 Apr 2017 19:08:10 +0000 (19:08 +0000)]
Merge "Rework getMetrics() api per API council" into oc-dev am:
abbea1df6b
am:
b3934d9043
Change-Id: I0f463f2d04da9a5ecd8ddcad965ce8821b0ee116
Ray Essick [Sat, 15 Apr 2017 19:01:18 +0000 (19:01 +0000)]
Merge "Rework getMetrics() api per API council" into oc-dev
am:
abbea1df6b
Change-Id: I9b8911d615e9521007a1cbb14514d05aef172f57
TreeHugger Robot [Sat, 15 Apr 2017 18:52:01 +0000 (18:52 +0000)]
Merge "Rework getMetrics() api per API council" into oc-dev
Yifan Hong [Sat, 15 Apr 2017 10:11:24 +0000 (10:11 +0000)]
Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev am:
35edfc1fdc
am:
6955963d18
Change-Id: I04617ab2fc8775616aa76f326a2360e6c7bebf69
OSDN Git Service
