332694 Commits

Author SHA1 Message Date
TreeHugger Robot
dd74c1a8cd Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev 2017-07-14 00:36:22 +00:00
TreeHugger Robot
f9dd150ea6 Merge "Convert CDMA caller ID codes while roaming on 3GPP networks" 2017-07-14 00:31:29 +00:00
Siqi Lin
9522e0c53f Merge "BootReceiver: Remove error log when last-header.txt is missing" into oc-dr1-dev am: d0b2c3b28c
am: 0e01513293

Change-Id: I0bfb235c4046623a5ae81cf8f2555ab408c0689c
2017-07-14 00:12:49 +00:00
Siqi Lin
0e01513293 Merge "BootReceiver: Remove error log when last-header.txt is missing" into oc-dr1-dev
am: d0b2c3b28c

Change-Id: If06d96e09251c6de129c978f939f2206cbcda2d4
2017-07-14 00:03:46 +00:00
Siqi Lin
d0b2c3b28c Merge "BootReceiver: Remove error log when last-header.txt is missing" into oc-dr1-dev 2017-07-13 23:56:05 +00:00
David Lin
261ec603d4 Merge "Fix issue with double vibration trigger" into oc-dr1-dev am: f34b4633bd
am: d9f8a6bd9d

Change-Id: I496e6162949d0e12093e09f690d19a10e7132351
2017-07-13 23:27:14 +00:00
Arthur Ishiguro
3087951777 Merge "Fix default constructor for NanoApp" 2017-07-13 23:23:26 +00:00
David Lin
d9f8a6bd9d Merge "Fix issue with double vibration trigger" into oc-dr1-dev
am: f34b4633bd

Change-Id: Iaa872f5a6990f01dd832f48c88a3fc4625a89063
2017-07-13 23:20:48 +00:00
Peng Xu
18e7027852 Merge "Add sensor HAL process into dump list" into oc-dr1-dev am: 2098c83afb
am: 15aef6c6cd

Change-Id: Icdaa9fd599a9d86657cebc97b468f08279bdccd0
2017-07-13 23:19:16 +00:00
TreeHugger Robot
f34b4633bd Merge "Fix issue with double vibration trigger" into oc-dr1-dev 2017-07-13 23:14:31 +00:00
TreeHugger Robot
b4dfcca0ab Merge "Switch file size formatters to use ICU's MeasureFormat" 2017-07-13 23:11:47 +00:00
Peng Xu
15aef6c6cd Merge "Add sensor HAL process into dump list" into oc-dr1-dev
am: 2098c83afb

Change-Id: I4c46791379775c9fee08df41d38c9cfb0fa1775e
2017-07-13 23:08:07 +00:00
TreeHugger Robot
2098c83afb Merge "Add sensor HAL process into dump list" into oc-dr1-dev 2017-07-13 23:01:11 +00:00
Nate Fischer
5ab00b31ee WebView: add IntDef for SafeBrowsingThreat
This adds an @IntDef for WebViewClient#onSafeBrowsingHit()'s threatType
argument.

Bug: 62723291, 63655766
Test: N/A
Change-Id: I71fb51753c461d1efa9de123bde977721c8da515
2017-07-13 15:28:21 -07:00
Naveen Kalla
4ca9d2ee0e Convert CDMA caller ID codes while roaming on 3GPP networks
Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.

Bug: 62933474
Test: Simulate Roaming scenario and ensure that the dial
      string is converted as expected.

Change-Id: If2b62b8148ba23840a4c018341e0fed24b41944b
2017-07-13 15:27:33 -07:00
Hugo Benichi
a428392c1d resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031
2017-07-14 07:25:51 +09:00
Roozbeh Pournader
f3cda89def Make TextInputTimePickerView use localized input
Previously, TextInputTimePickerView used the default numeric IME, which
could result in cases where the digits displayed in the text fields were
native, but the IME showed ASCII digits resulting in a mix.

Now we use setImeHintLocales to hint that we need a localized IME.

Change-Id: Ic4041dcc65a31bd00741c6d96d8cbc5dac9d77c8
Fixes: 63650251
Test: Manual (tested under en-US and ar-BH locales)
2017-07-13 15:25:24 -07:00
Lucas Dupin
ef94006264 Do not reload bitmap unless necessary
Let's just wait until the current async task finishes,
the engine will be recreated if the bitmap changes.

Test: Set wallpaper, no black frame
Change-Id: Icad8c18095119e9e035efc04704bc6d2d35af6d9
Fixes: 63065764
2017-07-13 15:19:27 -07:00
Naveen Kalla
abd2842ce1 Convert CDMA caller ID codes while roaming on 3GPP networks
Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.

Bug: 62933474
Test: Simulate Roaming scenario and ensure that the dial
      string is converted as expected.

Change-Id: If2b62b8148ba23840a4c018341e0fed24b41944b
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
2017-07-13 15:08:51 -07:00
Eugene Susla
38dff3b78a [Companion] Close chooser dialog on device tap
Fixes: 63597808
Test: Ensure list selection is now 1-tap
Change-Id: If99fc5e5c9b24526ac48dfc1c87659b01e713989
2017-07-13 14:56:03 -07:00
Philip Cuadra
980028da88 Use new powerHintAsync when available
Use the async version of powerHint when available.

Bug: 62377008
Test: Run systrace, confirm powerHints are async HIDL transactions
Change-Id: I3bb4022b78d380b054bf13008bb8b0d399bf1955
2017-07-13 14:54:09 -07:00
Siqi Lin
814594619c BootReceiver: Remove error log when last-header.txt is missing
It's normal for /data/system/last-header.txt to not exist on
the first boot after factory reset. The code already handles
this case properly so the Slog.e is just noise that shows up
in bugreports.

Bug: 37513804
Test: manual - boot after factory reset, check logcat
Change-Id: I1c8e3437cdbda5e04c0299764c7e4921bef67cb3
2017-07-13 14:39:31 -07:00
TreeHugger Robot
183f9ac263 Merge "Remove duplicate attrs." 2017-07-13 21:35:42 +00:00
Doris Ling
fbde2777e4 Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev am: 9f675cee28
am: db0ec7d60f

Change-Id: I7ef8fb885ee70d05b9afee829f8278f4236c9eb0
2017-07-13 21:22:00 +00:00
Doris Ling
db0ec7d60f Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev
am: 9f675cee28

Change-Id: I32b19e453af7a28c990a28b9726487415fe5be6f
2017-07-13 21:15:21 +00:00
TreeHugger Robot
9f675cee28 Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev 2017-07-13 20:59:39 +00:00
Tomasz Wasilczyk
e83dbb90fa Merge "Publish new Broadcast Radio APIs." 2017-07-13 20:50:10 +00:00
Abodunrinwa Toki
4a7aeb3cb0 Avoid FloatingToolbar flickers
by:
 1. Restricting 'moving hide' -- where we hide the toolbar if the
    toolbar is moving.
 2. Hide the toolbar when transitioning to 'select all' -- where the
    toolbar is refreshed.

Bug: 32910217
Bug: 30418276
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
bit CtsWidgetTestCases:android.widget.cts.TextViewTest

Change-Id: I1f44ee765d74bbcf08e6e7cd635f76d1e8f6305b
2017-07-13 21:48:51 +01:00
Treehugger Robot
4f2a0fe213 Merge "IpManager: define InitialConfiguration" 2017-07-13 20:45:21 +00:00
David Lin
baa2125a3d Fix issue with double vibration trigger
This patch fixes an issue that cause duplicated calls to HAL even when
the first call succeeded.

Bug: 63667425
Test: manual test
Change-Id: I4c29e3c9872cc42ea143b3adda3a3defca728e71
2017-07-13 13:43:53 -07:00
Jorim Jaggi
a8519d2f63 Merge "Also go to sleep when dozing" into oc-dr1-dev am: be1577ae59
am: efe90f8df1

Change-Id: I968bd2e3071f9f4024430b2718372339a57b6380
2017-07-13 20:32:47 +00:00
Arthur Ishiguro
afaddaaffb Fix default constructor for NanoApp
Bug: 37274363
Test: Compile and run CHQTS, verify warning not shown
Change-Id: I842f8571be31838b726fecfb138f329dea5f26fe
2017-07-13 13:25:33 -07:00
Roozbeh Pournader
1378a9d72c Make strike-through respect kerning at boundaries
Also clean up lower-level drawing of strike-through in Cavas.cpp.

We still cannot use the strike-through information from the font
since Skia doesn't provide it, so we are going with the default
values.

Test: Manual
Test: bit CtsTextTestCases:*
Test: adb shell am instrument -w -e package android.text com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug: 32907446
Change-Id: Iee6f8102a35eba0ff4127dbbef189529ab573e6d
2017-07-13 13:21:00 -07:00
Nikolas Bravo
8af5f7c440 Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev am: 479d915db5
am: de93e6912f

Change-Id: I861c5f7d4527d297e8049fbd6fddb3a5f96248fc
2017-07-13 20:20:57 +00:00
Jorim Jaggi
efe90f8df1 Merge "Also go to sleep when dozing" into oc-dr1-dev
am: be1577ae59

Change-Id: If8fea9defc84fcd3f7f8f2c98dcb00f13f7ffffc
2017-07-13 20:20:27 +00:00
Jorim Jaggi
be1577ae59 Merge "Also go to sleep when dozing" into oc-dr1-dev 2017-07-13 20:13:33 +00:00
Christopher Ferris
f003ae0f25 Merge "Implement dumpheap -m." 2017-07-13 20:10:47 +00:00
Android Build Merger (Role)
ee21301a28 Merge "Merge "Tear down agent after preflight rejection" into oc-dr1-dev am: 47303ec66b am: 19bb6c35ca" 2017-07-13 20:07:09 +00:00
Abodunrinwa Toki
a49d2eedc9 Merge "TextClassification.text is nullable" 2017-07-13 20:06:12 +00:00
Nikolas Bravo
de93e6912f Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev
am: 479d915db5

Change-Id: I3503c8306bb12da6ad1273ef207f550a37775b7b
2017-07-13 20:05:55 +00:00
Christopher Tate
1ff9475ea0 Merge "Tear down agent after preflight rejection" into oc-dr1-dev am: 47303ec66b
am: 19bb6c35ca

Change-Id: I17cbc0a91b65d755965ac4479d7656a7dbeef109
2017-07-13 20:05:40 +00:00
TreeHugger Robot
75265f1223 Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t." 2017-07-13 20:04:56 +00:00
TreeHugger Robot
6fea738beb Merge "Remove AppCompat from TouchLatency test" 2017-07-13 20:03:11 +00:00
Seigo Nonaka
6fef520af5 Merge "Implement family fallback." 2017-07-13 20:02:29 +00:00
TreeHugger Robot
479d915db5 Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev 2017-07-13 19:59:40 +00:00
Lucas Dupin
edd2360f16 Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev am: 6a6d63be45
am: b02198da14

Change-Id: I9b8ad92792978bb0eddca3ffe7688f366b95d7e9
2017-07-13 19:57:40 +00:00
Christopher Tate
19bb6c35ca Merge "Tear down agent after preflight rejection" into oc-dr1-dev
am: 47303ec66b

Change-Id: Id831cef2f90ad39537975d31407f00b2f768d59e
2017-07-13 19:56:56 +00:00
Lucas Dupin
b02198da14 Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev
am: 6a6d63be45

Change-Id: Ia0425e5333b437970786255b0a1e513fedfcf0bd
2017-07-13 19:49:59 +00:00
TreeHugger Robot
47303ec66b Merge "Tear down agent after preflight rejection" into oc-dr1-dev 2017-07-13 19:49:28 +00:00
Lucas Dupin
6a6d63be45 Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev
* changes:
  Check mark color after successful auth
  Ripple colors should match sysui theme.
  Correct navbar colors after rebooting
2017-07-13 19:41:32 +00:00