OSDN Git Service
Makoto Onuki [Mon, 17 Apr 2017 20:46:36 +0000 (20:46 +0000)]
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
am:
c3fa6ab2ac
Change-Id: Ie67b77c8873b237a82e9ec470e3fcb698d474e3e
TreeHugger Robot [Mon, 17 Apr 2017 20:35:55 +0000 (20:35 +0000)]
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
Aurimas Liutikas [Mon, 17 Apr 2017 20:21:25 +0000 (20:21 +0000)]
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev
am:
ff4e132cff
Change-Id: I72249172933a83c91c175dd46c96823368a25bda
TreeHugger Robot [Mon, 17 Apr 2017 20:15:16 +0000 (20:15 +0000)]
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev
Chien-Yu Chen [Mon, 17 Apr 2017 19:58:03 +0000 (19:58 +0000)]
Merge "Camera: Override enableZsl based on SDK version" into oc-dev
am:
3b41407f19
Change-Id: I8399759e0ba6cf31aaa7fb2330272522b6abdf5c
TreeHugger Robot [Mon, 17 Apr 2017 19:49:07 +0000 (19:49 +0000)]
Merge "Camera: Override enableZsl based on SDK version" into oc-dev
Joe LaPenna [Mon, 17 Apr 2017 19:08:19 +0000 (19:08 +0000)]
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
am:
5b06dbd12b
Change-Id: I29bf802473cd98352390a12120d2bbd9b293f5cf
TreeHugger Robot [Mon, 17 Apr 2017 19:02:58 +0000 (19:02 +0000)]
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
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
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: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:13:17 +0000 (17:13 +0000)]
Merge "media: Address API review comments" into oc-dev
am:
ab312729ce
Change-Id: Ie957c8c197ff2459cbc5d32c1716d78d0752ddbe
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
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
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
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
Aurimas Liutikas [Fri, 14 Apr 2017 21:51:59 +0000 (14:51 -0700)]
Enhance Chronometer to better support Swedish countdowns.
Adds a method isTheFinalCountDown that allows to correctly
determine whether it is the final countdown.
Test: None
Change-Id: I786ae3455479bac25ccf25efba1c3dce18185117
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: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: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: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: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 01:50:43 +0000 (01:50 +0000)]
Use vsync choreographer when moving PIP.
am:
487737b876
Change-Id: Ifc6c5a57748432bf1173b27d5377ed573c70ba65
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
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: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: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: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:04:52 +0000 (10:04 +0000)]
Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev
am:
35edfc1fdc
Change-Id: I0b604d7e6faf1b72bb7271fbb4ad7056f9d800ae
TreeHugger Robot [Sat, 15 Apr 2017 10:01:21 +0000 (10:01 +0000)]
Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev
Stephen Chen [Sat, 15 Apr 2017 09:13:41 +0000 (09:13 +0000)]
Merge "Remove ScoredNetwork.BADGING constants." into oc-dev
am:
e587591c5a
Change-Id: I7546e77a0a591ce25b2c771c30b4506d5666cc3f
TreeHugger Robot [Sat, 15 Apr 2017 09:04:30 +0000 (09:04 +0000)]
Merge "Remove ScoredNetwork.BADGING constants." into oc-dev
Kevin Chyn [Sat, 15 Apr 2017 07:11:00 +0000 (07:11 +0000)]
Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev
am:
4ea09f5ca4
Change-Id: I9aa9104818078c058f5f5cefaf3e442873a072e8
TreeHugger Robot [Sat, 15 Apr 2017 07:05:44 +0000 (07:05 +0000)]
Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev
Tyler Gunn [Sat, 15 Apr 2017 06:17:18 +0000 (06:17 +0000)]
Merge "Expose phone account register/unregister intents." am:
24299f5b06
am:
b993a44272
Change-Id: Ic3f8044b7df278b33208fae671abef21ae8f55d2
Tyler Gunn [Sat, 15 Apr 2017 06:13:21 +0000 (06:13 +0000)]
Merge "Expose phone account register/unregister intents."
am:
24299f5b06
Change-Id: Ifbc60e3221bee3813e2c854305144af901067b13
Treehugger Robot [Sat, 15 Apr 2017 06:07:25 +0000 (06:07 +0000)]
Merge "Expose phone account register/unregister intents."
Tyler Gunn [Fri, 14 Apr 2017 20:43:30 +0000 (13:43 -0700)]
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.
Test: Manual
Bug:
37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
Jorim Jaggi [Sat, 15 Apr 2017 04:56:51 +0000 (04:56 +0000)]
Merge "Wallpaper color extraction API stub" into oc-dev
am:
6acf7a7b45
Change-Id: I6d4e70f45b60fc76e017a982f70a2a7b14b3a3a9
Jorim Jaggi [Sat, 15 Apr 2017 04:52:20 +0000 (04:52 +0000)]
Merge "Wallpaper color extraction API stub" into oc-dev
Eugene Susla [Sat, 15 Apr 2017 04:22:48 +0000 (04:22 +0000)]
Merge "API for notification listener for Companioon apps" into oc-dev
am:
0d88904744
Change-Id: Ie6093be3e7699481473eeb597bc4d604728330a2
TreeHugger Robot [Sat, 15 Apr 2017 04:15:34 +0000 (04:15 +0000)]
Merge "API for notification listener for Companioon apps" into oc-dev
Svetoslav Ganov [Sat, 15 Apr 2017 03:33:02 +0000 (03:33 +0000)]
Merge "Add support for multiple fill contexts" into oc-dev
am:
41200eac71
Change-Id: I9a66bc2d97efbc19fd0cbfd57dfb13323e3ab31a
Svetoslav Ganov [Sat, 15 Apr 2017 03:29:08 +0000 (03:29 +0000)]
Merge "Add support for multiple fill contexts" into oc-dev
Etan Cohen [Sat, 15 Apr 2017 02:32:31 +0000 (02:32 +0000)]
Merge changes from topics 'network_specifier', 'networkspecifier' into oc-dev
am:
d98f26e4f3 -s ours
Change-Id: Ic728d22ee9d7407df5437e3da0468387f5c098c2
TreeHugger Robot [Sat, 15 Apr 2017 02:16:10 +0000 (02:16 +0000)]
Merge changes from topics 'network_specifier', 'networkspecifier' into oc-dev
* changes:
[CM] Unhide the NetworkSpecifier as object API
Make the NetworkSpecifier a class instead of a string.
Add test coverage for NetworkSpecifiers.
Eugene Susla [Mon, 10 Apr 2017 18:51:58 +0000 (11:51 -0700)]
API for notification listener for Companioon apps
Test: 1. Trigger the confitrmation dialog.
Ensure it looks exactly like the one from settings.
2. Call an API without associating the appa first
Ensure exception is thrown with a message mentioning the need to associate 1st
Change-Id: I94d4116e1988db869ed445ae3fd018c50590e3f4
Nathan Harold [Sat, 15 Apr 2017 01:59:13 +0000 (01:59 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE" am:
02278a5a02
am:
d50a325553
Change-Id: I6d55820dc1710035fcab839f6cae809fa44f16da
Adrian Roos [Sat, 15 Apr 2017 01:58:55 +0000 (01:58 +0000)]
Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev
am:
490ef3cda4
Change-Id: I6a808b422c23e0bd695d8422150e57ed9cf874ad
Nathan Harold [Sat, 15 Apr 2017 01:52:24 +0000 (01:52 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE"
am:
02278a5a02
Change-Id: I473f438a0336b8c5183f385f062493abb53966fe
Yohei Yukawa [Sat, 15 Apr 2017 01:51:55 +0000 (01:51 +0000)]
Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev
am:
e61d56fb70
Change-Id: If566134ba9f8ac40cf73a92745b45262681531c9
Adrian Roos [Sat, 15 Apr 2017 01:48:25 +0000 (01:48 +0000)]
Merge "AOD: Prolong AOD2 after interaction, turn off AOD when prox covered" into oc-dev
TreeHugger Robot [Sat, 15 Apr 2017 01:44:30 +0000 (01:44 +0000)]
Merge "Support flagNoPersonalizedLearning in layout XML" into oc-dev
Treehugger Robot [Sat, 15 Apr 2017 01:42:58 +0000 (01:42 +0000)]
Merge "Update doc string for getForbiddenPlmns() to READ_PHONE_STATE"
Amith Yamasani [Sat, 15 Apr 2017 01:41:29 +0000 (01:41 +0000)]
Merge "BLE scan API using PendingIntent" into oc-dev
am:
7859022e8e
Change-Id: Ic694cf7dae7e7c151155787da5b079699cec93ed
OSDN Git Service
