OSDN Git Service
Jakub Pawlowski [Tue, 11 Apr 2017 20:00:34 +0000 (20:00 +0000)]
Bluetooth 5 fix default AdvertisingSetParameters values
am:
1ab569d43f
Change-Id: I84333cc09b61ebbdf306663966e27e6b42556b85
Jakub Pawlowski [Tue, 11 Apr 2017 19:59:29 +0000 (19:59 +0000)]
Bluetooth: fix comment wording
am:
5203f76933 -s ours
Change-Id: I7f16614f63b5f0404c64dce4c4c65c91aba7e902
Svetoslav Ganov [Tue, 11 Apr 2017 19:35:51 +0000 (19:35 +0000)]
Merge "Keep a removed API to not break GCore presubmit" into oc-dev
am:
c62250ad52
Change-Id: I92b682ac25bd6460a0e10237faf6aed081b6c3c6
Android Build Merger (Role) [Tue, 11 Apr 2017 19:22:12 +0000 (19:22 +0000)]
Merge changes into oc-dev-plus-aosp
Jack Yu [Tue, 11 Apr 2017 19:21:19 +0000 (19:21 +0000)]
Merge "Deprecated ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" into oc-dev
am:
4011fff255
Change-Id: Ia233a19c30a880ea5631ae37ba0d91d91f49abfa
Svetoslav Ganov [Tue, 11 Apr 2017 18:58:50 +0000 (18:58 +0000)]
Merge "Keep a removed API to not break GCore presubmit" into oc-dev
Tyler Gunn [Tue, 11 Apr 2017 18:54:59 +0000 (18:54 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." into oc-dev
am:
76679ead10
Change-Id: I80192d01e464e36dc413587d4f776a12a57eba69
Adam Lesinski [Tue, 11 Apr 2017 18:49:45 +0000 (18:49 +0000)]
Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev
am:
fa7b34395c
Change-Id: I971b67d5e73b3a45e629212e6a9161c74cff5c72
Jack Yu [Tue, 11 Apr 2017 18:45:31 +0000 (18:45 +0000)]
Merge "Deprecated ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED" into oc-dev
Svet Ganov [Tue, 11 Apr 2017 18:40:14 +0000 (11:40 -0700)]
Keep a removed API to not break GCore presubmit
Change-Id: Ica38b7aad2a5a8792917d0da1d497f373b118077
Tyler Gunn [Tue, 11 Apr 2017 18:36:55 +0000 (18:36 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." into oc-dev
Jorim Jaggi [Tue, 11 Apr 2017 18:30:18 +0000 (18:30 +0000)]
Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev
am:
971fe468a4
Change-Id: Id22f93bb9250f587c678a401fa57507784a58ebc
Adam Lesinski [Tue, 11 Apr 2017 18:29:56 +0000 (18:29 +0000)]
Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev
Todd Kennedy [Tue, 11 Apr 2017 18:29:02 +0000 (18:29 +0000)]
Merge "add debug logs" into oc-dev
am:
7fa473b1aa
Change-Id: I1ea353968caff9d4e1ce2ef56267a40e3801be14
TreeHugger Robot [Tue, 11 Apr 2017 18:15:54 +0000 (18:15 +0000)]
Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev
Todd Kennedy [Tue, 11 Apr 2017 18:14:18 +0000 (18:14 +0000)]
Merge "add debug logs" into oc-dev
Makoto Onuki [Tue, 11 Apr 2017 18:11:20 +0000 (18:11 +0000)]
Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev
am:
a2ea59c9bb
Change-Id: Ic9eebe67290f7dcd7ff59bb40c81d39bf2a8d82d
Bill Yi [Tue, 11 Apr 2017 18:09:45 +0000 (18:09 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
e62e9a274a -s ours
Change-Id: Ib0cef189f301d3a79b75aa610994dc59d441ab81
Roozbeh Pournader [Tue, 11 Apr 2017 17:55:45 +0000 (17:55 +0000)]
Merge "Update fontchain_lint to test new emoji font" into oc-dev
am:
f72b0eec6e
Change-Id: Ie4e8d0621e8b5d133248f457c3a734ef035d7b80
Makoto Onuki [Tue, 11 Apr 2017 17:51:44 +0000 (17:51 +0000)]
Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev
TreeHugger Robot [Tue, 11 Apr 2017 17:49:36 +0000 (17:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Android Build Merger (Role) [Tue, 11 Apr 2017 17:33:53 +0000 (17:33 +0000)]
Merge "Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am:
4a43598bd6 am:
73def9c0f9 am:
f63f5c745e -s ours" into oc-dev-plus-aosp
Dan Willemsen [Tue, 11 Apr 2017 17:31:15 +0000 (17:31 +0000)]
Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am:
4a43598bd6 am:
73def9c0f9
am:
f63f5c745e -s ours
Change-Id: Ia64328862440b4025b68144e28174da00d88d44a
Jason Monk [Tue, 11 Apr 2017 17:28:01 +0000 (17:28 +0000)]
Merge "Fix screen pinning in seascape" into oc-dev
am:
d24ecd9b5c
Change-Id: I80d1e49a249b69493c2f2f611fe9e09cd93dd39f
Roozbeh Pournader [Tue, 11 Apr 2017 17:24:28 +0000 (17:24 +0000)]
Merge "Update fontchain_lint to test new emoji font" into oc-dev
Jason Monk [Tue, 11 Apr 2017 17:09:51 +0000 (17:09 +0000)]
Merge "Fix screen pinning in seascape" into oc-dev
Dan Willemsen [Tue, 11 Apr 2017 17:06:04 +0000 (17:06 +0000)]
Merge "Remove .(ll)ndk suffix from (ll)ndk_library" am:
4a43598bd6
am:
73def9c0f9
Change-Id: Idd1cf9bbffb15bfdab59c9b2e80cb31b477ce0cf
Dan Willemsen [Tue, 11 Apr 2017 16:54:57 +0000 (16:54 +0000)]
Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
am:
4a43598bd6
Change-Id: Ib66ddf53cbe91d2064f6268f9115cd577883acae
Romain Guy [Tue, 11 Apr 2017 16:37:14 +0000 (16:37 +0000)]
Merge "Hide ColorSpace.Renderer" into oc-dev
am:
5094caafc2
Change-Id: I74dad14a0881a69a69ec3f25e111897c29269fdd
Zhijun He [Tue, 11 Apr 2017 16:30:02 +0000 (16:30 +0000)]
Merge "ImageReader/Writer: add usage flag support" into oc-dev
am:
96d4ac0cc6
Change-Id: Ia98cc7f1caf6d5628e2aae1d78d159dc3ac6d261
Fan Zhang [Tue, 11 Apr 2017 16:27:09 +0000 (16:27 +0000)]
Merge "Update string description and char limits" into oc-dev
am:
3151a09dac
Change-Id: Id3b6af3b66959fb2d8311a7bad646c52ae4b4fe7
TreeHugger Robot [Tue, 11 Apr 2017 16:22:54 +0000 (16:22 +0000)]
Merge "Hide ColorSpace.Renderer" into oc-dev
Treehugger Robot [Tue, 11 Apr 2017 16:19:14 +0000 (16:19 +0000)]
Merge "Remove .(ll)ndk suffix from (ll)ndk_library"
TreeHugger Robot [Tue, 11 Apr 2017 16:17:11 +0000 (16:17 +0000)]
Merge "ImageReader/Writer: add usage flag support" into oc-dev
Jakub Pawlowski [Thu, 6 Apr 2017 14:22:57 +0000 (07:22 -0700)]
Bluetooth 5 fix default AdvertisingSetParameters values
Having advertiser be scannable and connectable by default is a bad
choice for new advertising set.
Bug:
30622771
Test: sl4a Bt5ScanTest
Change-Id: I4fc270e78ca4e62d3077c5cd28aa59b0518d2e77
(cherry picked from commit
010cc95583d6b93bdcc9cf7959f8470d109f8a3d)
Jakub Pawlowski [Thu, 23 Mar 2017 05:53:18 +0000 (22:53 -0700)]
Bluetooth: fix comment wording
Test: manual
Bug:
30622771
Change-Id: I5a589c98553f35248b0d95d332e9f35774075b24
(cherry picked from commit
e7f89b07e6fa3a99877af3298c2a80db23a591d7)
Fan Zhang [Tue, 11 Apr 2017 16:11:31 +0000 (16:11 +0000)]
Merge "Update string description and char limits" into oc-dev
Andreas Gampe [Tue, 11 Apr 2017 16:03:46 +0000 (16:03 +0000)]
Merge "OtaDexOptService: Log post-reboot moves" am:
ac293515b3 am:
4e04b5882f
am:
5e81820123
Change-Id: Ibad423bf2f49ec4af474ade4dd74fb772f50c50a
Geoffrey Pitsch [Tue, 11 Apr 2017 15:46:01 +0000 (15:46 +0000)]
Merge "Fix race condition in removeForegroundServiceFlag" into oc-dev
am:
f4077aa374
Change-Id: I0ba4947f1cf1c67a39333c1aff5aacc3c5131083
Makoto Onuki [Mon, 10 Apr 2017 22:37:17 +0000 (15:37 -0700)]
Expose UserHandle.getIdentifier() to CTS.
This allows CTS to pass user IDs returned by APIs as UserHandle to various
ADB commands.
Test: Exposing as TestApi only; m -j
Change-Id: Iedba6d83b717baacf9e7cf97f1d32f93c191a5ca
Andreas Gampe [Tue, 11 Apr 2017 15:38:05 +0000 (15:38 +0000)]
Merge "OtaDexOptService: Log post-reboot moves" am:
ac293515b3
am:
4e04b5882f
Change-Id: I6a94ee15c203a5386c5e92f49b65544d75d55e18
Andreas Gampe [Tue, 11 Apr 2017 15:32:27 +0000 (15:32 +0000)]
Merge "OtaDexOptService: Log post-reboot moves"
am:
ac293515b3
Change-Id: I76ded23a21610405079f275a61e1b61c23b46de7
TreeHugger Robot [Tue, 11 Apr 2017 15:32:08 +0000 (15:32 +0000)]
Merge "Fix race condition in removeForegroundServiceFlag" into oc-dev
Andreas Gampe [Tue, 11 Apr 2017 15:22:13 +0000 (15:22 +0000)]
Merge "OtaDexOptService: Log post-reboot moves"
Dan Willemsen [Fri, 7 Apr 2017 22:48:45 +0000 (15:48 -0700)]
Remove .(ll)ndk suffix from (ll)ndk_library
Soong handles these automatically now.
Bug:
33241851
Test: Android-aosp_arm.mk is the same before/after
Test: build.ninja is the same before/after
Test: build-aosp_arm.ninja is the same before/after
Merged-In: Ic10796e75bb886cc3f92c234714ab3e6c85112df
Change-Id: Ic10796e75bb886cc3f92c234714ab3e6c85112df
Romain Guy [Tue, 11 Apr 2017 14:24:56 +0000 (16:24 +0200)]
Hide ColorSpace.Renderer
Bug:
37073273
Test: Compile, make sure CTS does not rely on this API
Change-Id: Ia5d2638676be44464a173f904a21158c554b9ebf
Jason Monk [Tue, 28 Mar 2017 20:25:08 +0000 (16:25 -0400)]
Fix screen pinning in seascape
Test: visual
Change-Id: I7792d0f5f98e83f0b2fd57a831e82efa07533c2b
Fixes:
34072199
Wale Ogunwale [Tue, 11 Apr 2017 12:56:19 +0000 (12:56 +0000)]
Merge "Don't ensure config for activity that is about to be invisible" into oc-dev
am:
2d008a5fc1
Change-Id: I1cee8d490faf07b8b593543b53694ede3f177f57
TreeHugger Robot [Tue, 11 Apr 2017 12:46:57 +0000 (12:46 +0000)]
Merge "Don't ensure config for activity that is about to be invisible" into oc-dev
Dan Willemsen [Tue, 11 Apr 2017 07:41:29 +0000 (07:41 +0000)]
Merge "Remove .(ll)ndk suffix from (ll)ndk_library" into oc-dev
am:
62abe8f802
Change-Id: I187ee1234b648e4a6174ac71e376a705c3403df4
TreeHugger Robot [Tue, 11 Apr 2017 07:22:19 +0000 (07:22 +0000)]
Merge "Remove .(ll)ndk suffix from (ll)ndk_library" into oc-dev
Jakub Pawlowski [Tue, 11 Apr 2017 06:41:21 +0000 (06:41 +0000)]
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)" am:
763765b1b1 am:
131cc43a2c
am:
6b1228a556
Change-Id: I58a18a01d88db5f3edc9a15cc304ad561440d3fb
Jakub Pawlowski [Tue, 11 Apr 2017 06:36:13 +0000 (06:36 +0000)]
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)" am:
763765b1b1
am:
131cc43a2c
Change-Id: I7b12ecaaeb83bb3e5d49cd44d99c3339e2c0c835
Jakub Pawlowski [Tue, 11 Apr 2017 06:30:23 +0000 (06:30 +0000)]
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)"
am:
763765b1b1
Change-Id: Idb0c93f1f37b3fc4bd44bc4ad7d5474fd46e7413
Jakub Pawlowski [Tue, 11 Apr 2017 06:18:54 +0000 (06:18 +0000)]
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)"
Jakub Pawlowski [Mon, 10 Apr 2017 20:45:16 +0000 (13:45 -0700)]
Remove enable from PeriodicAdvertisingPariameters (1/2)
Instead of setting enable to true, one can just pass null
PeriodicAdvertisingParameters and achieve same result when starting the
set.
Passing the "enable" when updating the parameters make no sense, and
might be confusing.
Experience with "timeout" field, which was a part of AdvertiseSettings
show that merging fields that go into different HCI commands can cause
problems during processing, so keep enable as separate field.
Test: manual
Bug:
30622771
Change-Id: Ida02c59eb8433537179b4d22202fe745f8b4bb3e
Svet Ganov [Tue, 11 Apr 2017 06:17:05 +0000 (06:17 +0000)]
Merge "Move API for disabling an autofill service to the manager" into oc-dev
am:
7a6df3b777
Change-Id: I4805b84a3f585b6828307a32dd6d475e8d94de1a
TreeHugger Robot [Tue, 11 Apr 2017 06:10:07 +0000 (06:10 +0000)]
Merge "Move API for disabling an autofill service to the manager" into oc-dev
Bryce Lee [Tue, 11 Apr 2017 02:27:38 +0000 (02:27 +0000)]
Merge "Revert "ViewRootImpl: Fix child lifetime."" into oc-dev
am:
068b429c34
Change-Id: Id90a7439cebd13f04012f32dd3cbc5e4c9242a86
Bill Yi [Tue, 11 Apr 2017 02:18:58 +0000 (19:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8152cc56a3626db7cbafd758eeabf55a275acadc
Auto-generated-cl: translation import
Bryce Lee [Tue, 11 Apr 2017 02:05:29 +0000 (02:05 +0000)]
Merge "Revert "ViewRootImpl: Fix child lifetime."" into oc-dev
Bryce Lee [Tue, 11 Apr 2017 01:59:37 +0000 (01:59 +0000)]
Revert "ViewRootImpl: Fix child lifetime."
This reverts commit
ba29dbc3b38d9efb743d6fa7f9f8c4bb75c38b28.
The original commit causes apps such as phone and clock to not wake the
device.
Fixes:
37197491
Change-Id: I1b45cafbcbf12991d8e1e716e4d1751cd077c556
Keun-young Park [Tue, 11 Apr 2017 01:56:35 +0000 (01:56 +0000)]
Merge "ignore RemoteException from pm if shutdown is already on-going" into oc-dev
am:
cae7db3c9c
Change-Id: I181bce3b7e3defd37db9d4ad04f46d41fcd93559
Keun-young Park [Tue, 11 Apr 2017 01:48:22 +0000 (01:48 +0000)]
Merge "ignore RemoteException from pm if shutdown is already on-going" into oc-dev
Christopher Tate [Tue, 11 Apr 2017 01:19:34 +0000 (01:19 +0000)]
Merge "Ensure the system boots with a halfway sane time/date" into oc-dev
am:
45fe7eef89
Change-Id: I66e62280f5cb406535a7fd10990b699671e2c736
Jorim Jaggi [Fri, 7 Apr 2017 14:33:17 +0000 (16:33 +0200)]
Revert "Revert "Handle case when snapshot dimensions don't match""
This reverts commit
ba53d8ae410976709e1413b74173a791e8dead15.
Also fixes that we always had a size mismatch.
Test: TaskSnapshotSurfaceTest
Test: Open app in different orientation than snapshot, make sure
looks ok.
Bug:
36991071
Change-Id: If572b68fd72cec7679984fdff0be5905caba69f4
Fixes:
36703868
Fyodor Kupolov [Tue, 11 Apr 2017 01:09:00 +0000 (01:09 +0000)]
Merge "Cache mEphemeralAppsDisabled state" into oc-dev
am:
aedca2e55d
Change-Id: I18518d886b623fc8afc8daf2926f4bd2374ea6fa
TreeHugger Robot [Tue, 11 Apr 2017 01:05:39 +0000 (01:05 +0000)]
Merge "Ensure the system boots with a halfway sane time/date" into oc-dev
Svet Ganov [Tue, 11 Apr 2017 00:08:05 +0000 (17:08 -0700)]
Move API for disabling an autofill service to the manager
Test: the topic has a CTS test
bug:
37170723
Change-Id: I2be18968ea8df0fd3fb070fe2efc3e811b0e5a76
TreeHugger Robot [Tue, 11 Apr 2017 00:43:35 +0000 (00:43 +0000)]
Merge "Cache mEphemeralAppsDisabled state" into oc-dev
Adam Lesinski [Tue, 11 Apr 2017 00:13:41 +0000 (00:13 +0000)]
Merge "OverlayManagerService: Make broadcasts/updates explicit" into oc-dev
am:
ec8f353668
Change-Id: Ied4fc0b2fe79c69e6fd1b8677a5d615300119b39
Adam Lesinski [Tue, 11 Apr 2017 00:04:36 +0000 (00:04 +0000)]
Merge "OverlayManagerService: Make broadcasts/updates explicit" into oc-dev
Chad Brubaker [Mon, 10 Apr 2017 23:58:31 +0000 (23:58 +0000)]
Merge "Fix READ_PHONE_NUMBERS label" into oc-dev
am:
04088837b5
Change-Id: I60e0094d152d8bdcb092f357c00d87e467c344d9
Bookatz [Mon, 10 Apr 2017 23:53:08 +0000 (23:53 +0000)]
Merge "Fix double-detach DualTimer bug" into oc-dev
am:
754c46db37
Change-Id: Icc8abb22b32493f2bdf1d50350f7a2588ab627cb
Zhijun He [Thu, 23 Mar 2017 00:33:47 +0000 (17:33 -0700)]
ImageReader/Writer: add usage flag support
Also add an ImageWriter ctor to take additional arugment (format)
Test: ImageReader and Writer CTS tests
Bug:
32766711
Change-Id: I99e3862dd5b9a85c9df7879c14c84b68a35718ec
Adam Lesinski [Mon, 10 Apr 2017 23:35:19 +0000 (16:35 -0700)]
Make sure system UI context has the same LoadedApk as system context
When the system Application object is created, it should be shared by
both system and system UI context.
Bug:
37111478
Test: - Open settings
Test: - adb shell am crash com.android.settings
Test: - with crash dialog open, press volume keys
Test: - observe no crash
Change-Id: I2b4656680d25fe61fee69c01ee10522aac4e2942
Chad Brubaker [Mon, 10 Apr 2017 23:34:17 +0000 (23:34 +0000)]
Merge "Fix READ_PHONE_NUMBERS label" into oc-dev
TreeHugger Robot [Mon, 10 Apr 2017 23:33:42 +0000 (23:33 +0000)]
Merge "Fix double-detach DualTimer bug" into oc-dev
Android Build Merger (Role) [Mon, 10 Apr 2017 23:31:47 +0000 (23:31 +0000)]
Merge "Merge "Deprecate TelephonyManager.getCellLocation()" am:
bc0f610b25 am:
a51173943a am:
599a4c7326" into oc-dev-plus-aosp
nharold [Mon, 10 Apr 2017 23:31:06 +0000 (23:31 +0000)]
Merge "Deprecate TelephonyManager.getCellLocation()" am:
bc0f610b25 am:
a51173943a
am:
599a4c7326
Change-Id: I243647791bc08dbc2653d6d51af07a41c8ba3f97
Adam Lesinski [Mon, 10 Apr 2017 23:28:58 +0000 (23:28 +0000)]
Merge "AAPT2: Share split functionality between link and optimize" into oc-dev
am:
3750fd24c6
Change-Id: I336963f7e70fb77522d8f478b8c0a831e938d9f1
Daniel Nishi [Mon, 10 Apr 2017 23:27:51 +0000 (23:27 +0000)]
Merge "Fix crash when measuring storage." into oc-dev
am:
a6bd937c93
Change-Id: I33eaab3e22b9e3de0db3e5a9328cb52bf93113ab
Jack Yu [Mon, 10 Apr 2017 19:45:18 +0000 (12:45 -0700)]
Deprecated ACTION_PRECISE_DATA_CONNECTION_STATE_CHANGED
This broadcast intent will no longer work for the apps
running in the background. Apps should use Connectivity
Manager to listen for network changes.
Test: Telephony sanity tests
bug:
37156634
Change-Id: I5297cc5a624857d3e11a6d5fdf9369ab99ce88d4
TreeHugger Robot [Mon, 10 Apr 2017 23:22:43 +0000 (23:22 +0000)]
Merge "AAPT2: Share split functionality between link and optimize" into oc-dev
nharold [Mon, 10 Apr 2017 23:20:35 +0000 (23:20 +0000)]
Merge "Deprecate TelephonyManager.getCellLocation()" am:
bc0f610b25
am:
a51173943a
Change-Id: I333aa64ab7d2ad3467240feb02d66f197bfe4241
Jack He [Mon, 10 Apr 2017 23:20:08 +0000 (23:20 +0000)]
Merge "Add developer setting and system API for inband ringing support" am:
1da38b2bcd am:
d86c1fca76
am:
25c086b7e2
Change-Id: I7bf3b83c55a2b1dfaf23af65780529cc5a5fa8d4
Daniel Nishi [Mon, 10 Apr 2017 23:12:17 +0000 (23:12 +0000)]
Merge "Fix crash when measuring storage." into oc-dev
Jack He [Mon, 10 Apr 2017 23:11:15 +0000 (23:11 +0000)]
Merge "Add developer setting and system API for inband ringing support" am:
1da38b2bcd
am:
d86c1fca76
Change-Id: I711f396cbf1a63177fc8e61956264c3d7ce5a375
nharold [Mon, 10 Apr 2017 23:10:01 +0000 (23:10 +0000)]
Merge "Deprecate TelephonyManager.getCellLocation()"
am:
bc0f610b25
Change-Id: Ic6f55f3f00b608f3b8c3212b0dea1114250ec1fe
Fan Zhang [Mon, 10 Apr 2017 22:53:42 +0000 (15:53 -0700)]
Update string description and char limits
Change-Id: Idba5977e614094c3a96b1101f1234f26433300c8
Fix:
36680364
Test: builds
Jack He [Mon, 10 Apr 2017 22:59:56 +0000 (22:59 +0000)]
Merge "Add developer setting and system API for inband ringing support"
am:
1da38b2bcd
Change-Id: I24f6eccb3a3dcc37fd21ee48d8844bd5a1b112f0
nharold [Mon, 10 Apr 2017 22:49:59 +0000 (22:49 +0000)]
Merge "Deprecate TelephonyManager.getCellLocation()"
Andreas Gampe [Mon, 10 Apr 2017 22:48:50 +0000 (15:48 -0700)]
OtaDexOptService: Log post-reboot moves
Disable artifact checks for non-upgrade booting. Log the number of
successfully move artifacts.
Bug:
37158297
Test: m
Test: manual
Change-Id: Ic81531950582ce937e2e3b7815fb9132888d9a42
Jack He [Mon, 10 Apr 2017 22:47:54 +0000 (22:47 +0000)]
Merge "Add developer setting and system API for inband ringing support"
Tyler Gunn [Mon, 10 Apr 2017 22:18:01 +0000 (22:18 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." am:
c4ea961f91 am:
1fb1c39838
am:
b428268052
Change-Id: Ib0eae364d2fff21e80d04e740c34421d42c85c57
Todd Kennedy [Mon, 10 Apr 2017 22:10:56 +0000 (15:10 -0700)]
add debug logs
Test: TreeHugger
Change-Id: I4b12acb43aa4af7a5587842fe5e2528fee8f4fed
Tyler Gunn [Mon, 10 Apr 2017 22:08:12 +0000 (22:08 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API." am:
c4ea961f91
am:
1fb1c39838
Change-Id: I1c4cdcbe0c25acb899d387f70d128a267385474b
Tyler Gunn [Mon, 10 Apr 2017 21:58:08 +0000 (21:58 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."
am:
c4ea961f91
Change-Id: I77e7353fe345fbf17f9499aea9e792a23e8725d4
Treehugger Robot [Mon, 10 Apr 2017 21:49:05 +0000 (21:49 +0000)]
Merge "Add getSelfManagedPhoneAccounts() TelecomManager API."
Bookatz [Mon, 10 Apr 2017 20:10:46 +0000 (13:10 -0700)]
Fix double-detach DualTimer bug
DualTimer attempted to detach its subTimer twice when reset(true) was
called, once explicitly and once via a call to the main timer. This
fixes that problem by getting rid of the explicit detach in reset.
Bug:
37208694
Test: runtest -x
frameworks/base/core/tests/coretests/src/com/android/internal/os/BatteryStatsTests.java
and manually looked for "Removed unknown observer" error in logcat.
Change-Id: Ic5ff7d799d46236a74ab0825e108bef40bac0360
OSDN Git Service
