Svetoslav Ganov
29beb7f0ce
Merge "Keep a removed API to not break GCore presubmit" into oc-dev am: c62250ad52
...
am: 436bb48e56
2017-04-11 19:42:22 +00:00
Svetoslav Ganov
436bb48e56
Merge "Keep a removed API to not break GCore presubmit" into oc-dev
...
am: c62250ad52
2017-04-11 19:35:51 +00:00
Adam Lesinski
4f949c3b0b
Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev am: fa7b34395c
...
am: dc0bdeed94
2017-04-11 19:05:52 +00:00
Jorim Jaggi
0e0f0dca1d
Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev am: 971fe468a4
...
am: 4d384aa34e
2017-04-11 18:59:28 +00:00
Svetoslav Ganov
c62250ad52
Merge "Keep a removed API to not break GCore presubmit" into oc-dev
2017-04-11 18:58:56 +00:00
Makoto Onuki
1e13f26f80
Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev am: a2ea59c9bb
...
am: 538a42da3a
2017-04-11 18:56:42 +00:00
Adam Lesinski
dc0bdeed94
Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev
...
am: fa7b34395c
2017-04-11 18:49:45 +00:00
Svet Ganov
fc4a3004e3
Keep a removed API to not break GCore presubmit
...
Change-Id: Ica38b7aad2a5a8792917d0da1d497f373b118077
2017-04-11 11:40:14 -07:00
Jorim Jaggi
4d384aa34e
Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev
...
am: 971fe468a4
2017-04-11 18:30:18 +00:00
Adam Lesinski
fa7b34395c
Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev
2017-04-11 18:30:00 +00:00
TreeHugger Robot
971fe468a4
Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev
2017-04-11 18:16:00 +00:00
Makoto Onuki
538a42da3a
Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev
...
am: a2ea59c9bb
2017-04-11 18:11:20 +00:00
Makoto Onuki
a2ea59c9bb
Merge "Expose UserHandle.getIdentifier() to CTS." into oc-dev
2017-04-11 17:51:48 +00:00
Makoto Onuki
cb8936eae9
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
2017-04-11 08:42:57 -07:00
Jakub Pawlowski
3ba6943778
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)" am: 763765b1b1 am: 131cc43a2c am: 6b1228a556
...
am: 143e94d94f
2017-04-11 06:49:29 +00:00
Jakub Pawlowski
143e94d94f
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)" am: 763765b1b1 am: 131cc43a2c
...
am: 6b1228a556
2017-04-11 06:41:21 +00:00
Jakub Pawlowski
6b1228a556
Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)" am: 763765b1b1
...
am: 131cc43a2c
2017-04-11 06:36:13 +00:00
Svet Ganov
ffa27feeb4
Merge "Move API for disabling an autofill service to the manager" into oc-dev am: 7a6df3b777
...
am: de369349a0
2017-04-11 06:26:32 +00:00
Jakub Pawlowski
e6c453d828
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
2017-04-11 06:18:44 +00:00
Svet Ganov
de369349a0
Merge "Move API for disabling an autofill service to the manager" into oc-dev
...
am: 7a6df3b777
2017-04-11 06:17:05 +00:00
TreeHugger Robot
7a6df3b777
Merge "Move API for disabling an autofill service to the manager" into oc-dev
2017-04-11 06:10:13 +00:00
Bryce Lee
f63f5224c2
Merge "Revert "ViewRootImpl: Fix child lifetime."" into oc-dev am: 068b429c34
...
am: cd1cbc272b
2017-04-11 02:36:26 +00:00
Bryce Lee
cd1cbc272b
Merge "Revert "ViewRootImpl: Fix child lifetime."" into oc-dev
...
am: 068b429c34
2017-04-11 02:27:38 +00:00
Bryce Lee
068b429c34
Merge "Revert "ViewRootImpl: Fix child lifetime."" into oc-dev
2017-04-11 02:05:33 +00:00
Bryce Lee
16e5089eb5
Revert "ViewRootImpl: Fix child lifetime."
...
This reverts commit ba29dbc3b3
2017-04-11 02:02:11 +00:00
Jorim Jaggi
30d64f3a93
Revert "Revert "Handle case when snapshot dimensions don't match""
...
This reverts commit ba53d8ae41
2017-04-10 18:10:44 -07:00
Svet Ganov
f20a037ba2
Move API for disabling an autofill service to the manager
...
Test: the topic has a CTS test
bug:37170723
Change-Id: I2be18968ea8df0fd3fb070fe2efc3e811b0e5a76
2017-04-10 17:43:44 -07:00
Adam Lesinski
aa0ee3a6e6
Merge "OverlayManagerService: Make broadcasts/updates explicit" into oc-dev am: ec8f353668
...
am: 475752ad50
2017-04-11 00:18:52 +00:00
Adam Lesinski
475752ad50
Merge "OverlayManagerService: Make broadcasts/updates explicit" into oc-dev
...
am: ec8f353668
2017-04-11 00:13:41 +00:00
Bookatz
6712d06671
Merge "Fix double-detach DualTimer bug" into oc-dev am: 754c46db37
...
am: 3c820a12f1
2017-04-11 00:11:39 +00:00
Adam Lesinski
ec8f353668
Merge "OverlayManagerService: Make broadcasts/updates explicit" into oc-dev
2017-04-11 00:04:41 +00:00
Bookatz
3c820a12f1
Merge "Fix double-detach DualTimer bug" into oc-dev
...
am: 754c46db37
2017-04-10 23:53:08 +00:00
Adam Lesinski
6f1a917134
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
2017-04-10 16:35:19 -07:00
TreeHugger Robot
754c46db37
Merge "Fix double-detach DualTimer bug" into oc-dev
2017-04-10 23:33:45 +00:00
Jack He
cf6b2528d1
Merge "Add developer setting and system API for inband ringing support" am: 1da38b2bcd am: d86c1fca76 am: 25c086b7e2
...
am: b111c6f753
2017-04-10 23:31:55 +00:00
Jack He
b111c6f753
Merge "Add developer setting and system API for inband ringing support" am: 1da38b2bcd am: d86c1fca76
...
am: 25c086b7e2
2017-04-10 23:20:08 +00:00
Jack He
25c086b7e2
Merge "Add developer setting and system API for inband ringing support" am: 1da38b2bcd
...
am: d86c1fca76
2017-04-10 23:11:15 +00:00
Bookatz
4a3eda992b
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
2017-04-10 14:28:00 -07:00
Jack He
e86bdcaed1
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
2017-04-10 19:49:36 +00:00
Andrii Kulian
c489f6234a
Merge "Fix activity move between displays" into oc-dev am: c2ec7bf965
...
am: f44551b505
2017-04-10 19:42:56 +00:00
Andrii Kulian
f44551b505
Merge "Fix activity move between displays" into oc-dev
...
am: c2ec7bf965
2017-04-10 19:35:28 +00:00
Andrii Kulian
c2ec7bf965
Merge "Fix activity move between displays" into oc-dev
2017-04-10 19:20:37 +00:00
Dmitry Dementyev
a7dd87ce2d
Merge "Make visible only accounts for which authenticator supports contacts operations for callers with READ_CONTACTS permission." into oc-dev
...
am: d401163599
2017-04-10 19:14:52 +00:00
Dmitry Dementyev
d401163599
Merge "Make visible only accounts for which authenticator supports contacts operations for callers with READ_CONTACTS permission." into oc-dev
2017-04-10 18:30:53 +00:00
Selim Gurun
a64ebd5727
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev am: c922c4827a
...
am: e7534f48ce
2017-04-10 16:56:06 +00:00
Selim Gurun
e7534f48ce
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
...
am: c922c4827a
2017-04-10 16:48:28 +00:00
TreeHugger Robot
c922c4827a
Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
2017-04-10 16:36:48 +00:00
Eugene Susla
d2d45e9de8
Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev
...
am: 0ac8fd7adb
2017-04-10 15:18:14 +00:00
TreeHugger Robot
0ac8fd7adb
Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev
2017-04-10 15:06:10 +00:00
Bryce Lee
eb346fc10d
Merge "Update decor LayoutParams when window is already added." into oc-dev am: 9c80a16c45
...
am: da9546bebb
2017-04-10 14:38:07 +00:00
