Commit Graph

75976 Commits

Author SHA1 Message Date
Roozbeh Pournader
c6df994b66 Merge "Keep spans while transforming to uppercase" into oc-dev
am: cd3f72d628

Change-Id: Ie93ae0764c46883c46f5d4f5a8996d57aa143b7e
2017-04-12 00:14:26 +00:00
Evan Rosky
97a97c72fd Merge "Make AdapterView auto-focusable-aware" into oc-dev
am: 7d6bf45428

Change-Id: I1f44573ac5aa04c097f7d93298e27d99c54c6ce8
2017-04-12 00:11:54 +00:00
TreeHugger Robot
cd3f72d628 Merge "Keep spans while transforming to uppercase" into oc-dev 2017-04-12 00:02:35 +00:00
Evan Rosky
7d6bf45428 Merge "Make AdapterView auto-focusable-aware" into oc-dev 2017-04-12 00:02:25 +00:00
Mark Salyzyn
097487aaaf Merge "jni: isLoggable: adapt to removal of property name size limit" am: cf39eea407 am: 5f98be7f11
am: 3da7584dc4

Change-Id: I2fd96c0c9cae8043bb5fabaa32b542b6965abcf7
2017-04-11 23:44:04 +00:00
Mark Salyzyn
3da7584dc4 Merge "jni: isLoggable: adapt to removal of property name size limit" am: cf39eea407
am: 5f98be7f11

Change-Id: I4997e6f310c08cd0cf094a04685859b2853f8a05
2017-04-11 23:33:22 +00:00
Jaekyun Seok
88f49930bc Merge "Bring back the priority feature for static RRO" into oc-dev
am: 8f8a71d170

Change-Id: I6812e2617a030a33158d7f859404da2f5e9fde66
2017-04-11 21:17:17 +00:00
TreeHugger Robot
8f8a71d170 Merge "Bring back the priority feature for static RRO" into oc-dev 2017-04-11 21:03:00 +00:00
Roozbeh Pournader
b2d00340fd Keep spans while transforming to uppercase
We now use ICU's new functionality for casing edits to preserve
the spans while applying AllCapsTransformationMethod.

Test: Manual
Test: CTS tests added and pass
Bug: 7198872
Bug: 19047649
Bug: 19713814
Bug: 34853618
Bug: https://code.google.com/p/android/issues/detail?id=67509
Change-Id: I0df388e79894961efb272d497f1dcc0570a6c085
2017-04-11 13:49:18 -07:00
Svetoslav Ganov
436bb48e56 Merge "Keep a removed API to not break GCore presubmit" into oc-dev
am: c62250ad52

Change-Id: I92b682ac25bd6460a0e10237faf6aed081b6c3c6
2017-04-11 19:35:51 +00:00
Jakub Pawlowski
2d7d617e6a Merge changes from topic 'bt5-cherry-pickery-2' into oc-dev
* changes:
  Remove enable from PeriodicAdvertisingPariameters (1/2)
  Bluetooth 5 fix default AdvertisingSetParameters values
  Bluetooth: fix comment wording
2017-04-11 19:19:36 +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
Adam Lesinski
dc0bdeed94 Merge "Make sure system UI context has the same LoadedApk as system context" into oc-dev
am: fa7b34395c

Change-Id: I971b67d5e73b3a45e629212e6a9161c74cff5c72
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

Change-Id: Id22f93bb9250f587c678a401fa57507784a58ebc
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

Change-Id: Ic9eebe67290f7dcd7ff59bb40c81d39bf2a8d82d
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
Jakub Pawlowski
326996916d 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
(cherry picked from commit e6c453d828)
2017-04-11 09:13:38 -07:00
Jakub Pawlowski
1ab569d43f 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 010cc95583)
2017-04-11 09:13:31 -07:00
Jakub Pawlowski
5203f76933 Bluetooth: fix comment wording
Test: manual
Bug: 30622771
Change-Id: I5a589c98553f35248b0d95d332e9f35774075b24
(cherry picked from commit e7f89b07e6)
2017-04-11 09:13:18 -07: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
Mark Salyzyn
8143fa57ad jni: isLoggable: adapt to removal of property name size limit
There is no longer a name size limit to the properties, remove
illegalArgumentException if tag length is too large.

Test: build
Bug: 36696208
Change-Id: I4b4329c8c951082ed0d777cdd70ee3e773bed16c
2017-04-11 07:31:40 -07:00
Jakub Pawlowski
143e94d94f Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)" am: 763765b1b1 am: 131cc43a2c
am: 6b1228a556

Change-Id: I58a18a01d88db5f3edc9a15cc304ad561440d3fb
2017-04-11 06:41:21 +00:00
Jakub Pawlowski
6b1228a556 Merge "Remove enable from PeriodicAdvertisingPariameters (1/2)" am: 763765b1b1
am: 131cc43a2c

Change-Id: I7b12ecaaeb83bb3e5d49cd44d99c3339e2c0c835
2017-04-11 06:36:13 +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

Change-Id: I4805b84a3f585b6828307a32dd6d475e8d94de1a
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
cd1cbc272b Merge "Revert "ViewRootImpl: Fix child lifetime."" into oc-dev
am: 068b429c34

Change-Id: Id90a7439cebd13f04012f32dd3cbc5e4c9242a86
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.

The original commit causes apps such as phone and clock to not wake the
device.

Fixes: 37197491
Change-Id: I1b45cafbcbf12991d8e1e716e4d1751cd077c556
2017-04-11 02:02:11 +00:00
Jaekyun Seok
42d53f6b18 Bring back the priority feature for static RRO
Supporting the priority feature is requested by partners because they
want to layer RRO for their customers.
Applying the priority feature on non-static RRO isn't feasible because
their priority should be managed directly by users.

Test: building succeeded and tested on sailfish device.
Bug: 37185740
Change-Id: I8ef83c5e3178bd395ec7e6498764a535f24ef235
2017-04-11 10:29:34 +09:00
Jorim Jaggi
30d64f3a93 Revert "Revert "Handle case when snapshot dimensions don't match""
This reverts commit ba53d8ae41.

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
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
475752ad50 Merge "OverlayManagerService: Make broadcasts/updates explicit" into oc-dev
am: ec8f353668

Change-Id: Ied4fc0b2fe79c69e6fd1b8677a5d615300119b39
2017-04-11 00:13:41 +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

Change-Id: Icc8abb22b32493f2bdf1d50350f7a2588ab627cb
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
b111c6f753 Merge "Add developer setting and system API for inband ringing support" am: 1da38b2bcd am: d86c1fca76
am: 25c086b7e2

Change-Id: I7bf3b83c55a2b1dfaf23af65780529cc5a5fa8d4
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

Change-Id: I711f396cbf1a63177fc8e61956264c3d7ce5a375
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
f44551b505 Merge "Fix activity move between displays" into oc-dev
am: c2ec7bf965

Change-Id: I7831bea7832d4a0ddd1f841c9ce2cce5bda403c7
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

Change-Id: Ia6c1d5008ed4884f7214d589f1d2b4e02413cf8e
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
e7534f48ce Merge "Add an API to enable disable safebrowsing in WebView" into oc-dev
am: c922c4827a

Change-Id: If6d26b4e0965f4a889ab97a9753b682d4a36885b
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