OSDN Git Service
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
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"
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
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
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
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
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
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
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
Keun-young Park [Fri, 7 Apr 2017 16:31:01 +0000 (09:31 -0700)]
ignore RemoteException from pm if shutdown is already on-going
- In new shutdown flow, adb is guaranteed to be alive while system server
is alive.
- power manager can be killed before system server is killed.
- This leads into RemoteException for shutdown request to power manager.
- If shutdown is already on-going (=sys.powerctl set), the RemoteException
should be ignored.
bug:
37096155
Test: adb shell svc power reboot|shutdown and check output to adb
Change-Id: Ia90a900d55123bd7c1bf57c90c49d35332ebfdf5
Todd Kennedy [Mon, 10 Apr 2017 20:33:48 +0000 (20:33 +0000)]
Merge "send broadcast to the right users" into oc-dev
am:
4a30689414
Change-Id: I25077adff02d451493f487432a174aa3fbbff2d8
Wale Ogunwale [Mon, 10 Apr 2017 20:32:17 +0000 (20:32 +0000)]
Merge "Do not set outActivity if value is null." into oc-dev
am:
a09111e745
Change-Id: I5bae5f17d2b50f845f1b147458b3351bbf99b615
Tyler Gunn [Fri, 7 Apr 2017 21:57:37 +0000 (14:57 -0700)]
Add getSelfManagedPhoneAccounts() TelecomManager API.
This is consistent with the existing getCallCapablePhoneAccounts API
which is used to get the phone accounts capable of placing phone calls.
Test: CTS
Bug:
34159263
Merged-In: I1396c63a6882947cd66721528e53b6964a9091e0
Change-Id: I1396c63a6882947cd66721528e53b6964a9091e0
Todd Kennedy [Mon, 10 Apr 2017 20:10:11 +0000 (20:10 +0000)]
Merge "send broadcast to the right users" into oc-dev
Wale Ogunwale [Mon, 10 Apr 2017 20:04:06 +0000 (20:04 +0000)]
Merge "Do not set outActivity if value is null." into oc-dev
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
Change-Id: Ic10796e75bb886cc3f92c234714ab3e6c85112df
Fyodor Kupolov [Thu, 6 Apr 2017 23:08:59 +0000 (16:08 -0700)]
Cache mEphemeralAppsDisabled state
Init mEphemeralAppsDisabled in systemReady when settings provider
is available.
Registered content observers for ENABLE_EPHEMERAL_FEATURE and
WEB_ACTION_ENABLED.
Test: manual triggering enable_ephemeral_feature=1/0
Fixes:
36869938
Fixes:
36895304
Change-Id: I0051c45bb209d86041b967a409f8a95967df21dc
Jack He [Fri, 18 Nov 2016 00:19:43 +0000 (16:19 -0800)]
Add developer setting and system API for inband ringing support
* Add 1 system API to check inband ringing flag in config.xml
static isInbandRingingSupported(Context)
* Add developer menu options to enable this feature
Bug:
19171297
Test: mm -j 40, HFP regression testing, testplans/82144
Change-Id: Iaf56ea41911f546bbc7ae1f82e399d0f8d48f75f
Christopher Tate [Mon, 10 Apr 2017 18:45:05 +0000 (11:45 -0700)]
Ensure the system boots with a halfway sane time/date
Just in case the kernel or vendor glue don't initialize the system time
sensibly, we now make sure the current time at boot is at least up to the
build time of the system disk image.
Bug
36736983
Test: manual
Change-Id: I46f776300ca4f5ad01396fc17c83fc833e1713f9
Sudheer Shanka [Mon, 10 Apr 2017 19:37:21 +0000 (19:37 +0000)]
Merge "NetworkPolicyManagerService: fix deadlock" into oc-dev
am:
73edcd7328
Change-Id: I8428663ed86cc4257b24ad10488d69b89666537d
Andrii Kulian [Mon, 10 Apr 2017 19:35:28 +0000 (19:35 +0000)]
Merge "Fix activity move between displays" into oc-dev
am:
c2ec7bf965
Change-Id: I7831bea7832d4a0ddd1f841c9ce2cce5bda403c7
Sudheer Shanka [Mon, 10 Apr 2017 19:28:25 +0000 (19:28 +0000)]
Merge "NetworkPolicyManagerService: fix deadlock" into oc-dev
Jerry Zhang [Mon, 10 Apr 2017 19:26:47 +0000 (19:26 +0000)]
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" into oc-dev
am:
0015a15353
Change-Id: I426a6ab01081887fa79193e6ee48288f79b2c74b
Andrii Kulian [Mon, 10 Apr 2017 19:20:31 +0000 (19:20 +0000)]
Merge "Fix activity move between displays" into oc-dev
Dmitry Dementyev [Mon, 10 Apr 2017 19:14:52 +0000 (19:14 +0000)]
Merge "Make visible only accounts for which authenticator supports contacts operations for callers with READ_CONTACTS permission." into oc-dev
am:
d401163599
Change-Id: Ia6c1d5008ed4884f7214d589f1d2b4e02413cf8e
Todd Kennedy [Mon, 10 Apr 2017 19:12:11 +0000 (12:12 -0700)]
send broadcast to the right users
Change-Id: Ibda2d922cd58d6ca1c1a4ecdccaa25e5c71c6320
Fixes:
37192695
Test: manual; create restricted profile and see that users haven't been removed
Adam Lesinski [Tue, 4 Apr 2017 01:12:45 +0000 (18:12 -0700)]
AAPT2: Share split functionality between link and optimize
Generating splits should be possible to do from the optimize command.
This means that a lot of infrastructure around split APKs can be
shared by both the optimize and link phase.
Bug:
35925830
Change-Id: Ia88b9e4bff300a56353b2f7a4a2547c8eb43a299
Test: manual
Jerry Zhang [Mon, 10 Apr 2017 18:51:53 +0000 (18:51 +0000)]
Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" into oc-dev
Dmitry Dementyev [Mon, 10 Apr 2017 18:30:47 +0000 (18:30 +0000)]
Merge "Make visible only accounts for which authenticator supports contacts operations for callers with READ_CONTACTS permission." into oc-dev
Bryce Lee [Mon, 10 Apr 2017 18:06:17 +0000 (11:06 -0700)]
Do not set outActivity if value is null.
Recent changes passed down the nullable array to a method where it
was not being properly checked.
Change-Id: Ibf940f9225e4c9901869188aa55a04d0908015c3
Fixes:
37197666
Test: manual via bug repro steps.
Geoffrey Pitsch [Mon, 10 Apr 2017 17:12:58 +0000 (13:12 -0400)]
Fix race condition in removeForegroundServiceFlag
Also fix flake in our tests.
Test: runtest systemui-notification
Fixes:
36550043
Fixes:
36551790
Change-Id: I910e9233a17ef325bcb173c50c00d9982dc72224
Chad Brubaker [Mon, 10 Apr 2017 17:48:35 +0000 (10:48 -0700)]
Fix READ_PHONE_NUMBERS label
Change-Id: If4a254092168d9f7b133a58b59dd946f64cefdae
Fixes:
37207265
Test: builds
Wale Ogunwale [Mon, 10 Apr 2017 15:05:41 +0000 (08:05 -0700)]
Don't ensure config for activity that is about to be invisible
We were relaunching an activity in the docked stack that is been
dismissed because we call ensure configuration on it due to the
resize of it been moved to the fullscreen stack. This isn't needed
as the activity is about to become invisible since it is been moved
to a stack that isn't visible.
We now ensuring the configuration if:
- The stack the activity is in shouldn't be visible.
- The activity is currently stopped or stopping.
Change-Id: I6adac6b11a0db4b100e623e4074e169660206567
Fixes:
37118176
Test: Activity in docked stack isn't relaunched when dismissed.
Selim Gurun [Mon, 10 Apr 2017 16:48:28 +0000 (16:48 +0000)]
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
am:
c922c4827a
Change-Id: If6d26b4e0965f4a889ab97a9753b682d4a36885b
TreeHugger Robot [Mon, 10 Apr 2017 16:36:41 +0000 (16:36 +0000)]
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
Eugene Susla [Mon, 10 Apr 2017 15:18:14 +0000 (15:18 +0000)]
Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev
am:
0ac8fd7adb
Change-Id: Icb3fa2e51547fc50cc161052ca83050b5539a1f9
Erik Kline [Mon, 10 Apr 2017 15:09:14 +0000 (15:09 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams" into oc-dev
am:
e9ec87d0d4
Change-Id: I97ee81da94ac39199bb1e0ef2f6964b5a27d6358
TreeHugger Robot [Mon, 10 Apr 2017 15:06:05 +0000 (15:06 +0000)]
Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev
Erik Kline [Mon, 10 Apr 2017 14:57:45 +0000 (14:57 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams" into oc-dev
Bryce Lee [Mon, 10 Apr 2017 14:30:08 +0000 (14:30 +0000)]
Merge "Update decor LayoutParams when window is already added." into oc-dev
am:
9c80a16c45
Change-Id: I176bf43e9a200fc31641abe2fe45f2e0a284005f
Bryce Lee [Mon, 10 Apr 2017 14:22:44 +0000 (14:22 +0000)]
Merge "Update decor LayoutParams when window is already added." into oc-dev
Andrei Stingaceanu [Mon, 10 Apr 2017 13:02:40 +0000 (13:02 +0000)]
Merge "AutoSize TextView - fix measurements" into oc-dev
am:
e812e7dc2e
Change-Id: Ia8412a36bfb78752ead1a56b5391d30d9691ed22
Charles He [Mon, 10 Apr 2017 12:53:29 +0000 (12:53 +0000)]
Merge "VPN: cancel always-on notification with new id" into oc-dev
am:
4286c5768d
Change-Id: I97138fb1b0418a74de0ea41c191f6b9968ab947c
Andrei Stingaceanu [Mon, 10 Apr 2017 12:48:28 +0000 (12:48 +0000)]
Merge "AutoSize TextView - fix measurements" into oc-dev
Charles He [Mon, 10 Apr 2017 12:43:32 +0000 (12:43 +0000)]
Merge "VPN: cancel always-on notification with new id" into oc-dev
Erik Kline [Fri, 10 Mar 2017 10:35:34 +0000 (19:35 +0900)]
Tethering: support Local-only Hotspot mode for downstreams
Test: as follows
- built (bullhead)
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
31466854
Change-Id: Ia50e28c8ce0af8cdd7ac63217d921aff213668e7
Eric Sandness [Mon, 10 Apr 2017 12:27:17 +0000 (12:27 +0000)]
Merge "Fix mock of setApplicationRestrictions()" into oc-dev
am:
c9a6e75682
Change-Id: I6abbe1bf0073e236f1379a2dca208f5d3eab5e7f
Erik Kline [Mon, 10 Apr 2017 12:21:57 +0000 (12:21 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams" am:
d3128d4b55 am:
908ce167eb
am:
f6626e812c
Change-Id: I79677f7e8e7ae5abec2a13b5e5391b8f07857a36
Eric Sandness [Mon, 10 Apr 2017 12:18:08 +0000 (12:18 +0000)]
Merge "Fix mock of setApplicationRestrictions()" into oc-dev
Erik Kline [Mon, 10 Apr 2017 12:12:17 +0000 (12:12 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams" am:
d3128d4b55
am:
908ce167eb
Change-Id: I6e72a9b90e59ea5abd1dfa11c6c3d16a5c98751c
Erik Kline [Mon, 10 Apr 2017 12:02:49 +0000 (12:02 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams"
am:
d3128d4b55
Change-Id: Ic7d5e3e23f9ccc0f094ba5991e2fdefa82865b01
Treehugger Robot [Mon, 10 Apr 2017 11:50:31 +0000 (11:50 +0000)]
Merge "Tethering: support Local-only Hotspot mode for downstreams"
Emilian Peev [Mon, 10 Apr 2017 10:14:31 +0000 (10:14 +0000)]
Merge "DngCreator: Populate baseline exposure tag" into oc-dev
am:
b96891e0e3
Change-Id: I37c556ff394769f6e38e8f19ca90667709ce8bf5
Erik Kline [Fri, 10 Mar 2017 10:35:34 +0000 (19:35 +0900)]
Tethering: support Local-only Hotspot mode for downstreams
Test: as follows
- built (bullhead)
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
31466854
Change-Id: Ia50e28c8ce0af8cdd7ac63217d921aff213668e7
TreeHugger Robot [Mon, 10 Apr 2017 10:03:57 +0000 (10:03 +0000)]
Merge "DngCreator: Populate baseline exposure tag" into oc-dev
Andrei Stingaceanu [Wed, 5 Apr 2017 15:51:00 +0000 (16:51 +0100)]
AutoSize TextView - fix measurements
The BoringLayout measurements for auto-size are
incorrect. Removed those and kept the StaticLayout
measurements.
Bug:
36940118
Test: cts-tradefed run cts-dev -m CtsWidgetTestCases -t\
android.widget.cts.TextViewTest
Change-Id: I772ade08ed26efac05ca56cb7df8cfec0327633b
Lorenzo Colitti [Mon, 10 Apr 2017 07:02:55 +0000 (16:02 +0900)]
resolve merge conflicts of
edb6946bd119 to oc-dev-plus-aosp
Test: make -j64 framework services
Change-Id: Ia87be346703637ebcb88bcf39d7e8c3c71db44ab