OSDN Git Service

android-x86/frameworks-base.git
6 years agoAdd performance test for Debug.getPss()
Arthur Eubanks [Mon, 18 Dec 2017 21:27:51 +0000 (13:27 -0800)]
Add performance test for Debug.getPss()

Test: m CorePerfTests
Test: adb install CorePerfTests.apk
Test: adb shell am instrument -w -e class android.os.PssPerfTest \
com.android.perftests.core/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ia8cacb86c14b9956c9d526195d90848c678da6a6

6 years agoMerge "Fix android.text.format.FormatterText expectation"
Siyamed Sinir [Tue, 12 Dec 2017 22:55:04 +0000 (22:55 +0000)]
Merge "Fix android.text.format.FormatterText expectation"

6 years agoMerge "Adds getPort (hidden) to AudioDeviceInfo class"
Hongwei Wang [Tue, 12 Dec 2017 21:42:58 +0000 (21:42 +0000)]
Merge "Adds getPort (hidden) to AudioDeviceInfo class"

6 years agoMerge "DisplayCutout: Only dispatch to apps requesting it"
Adrian Roos [Tue, 12 Dec 2017 21:15:59 +0000 (21:15 +0000)]
Merge "DisplayCutout: Only dispatch to apps requesting it"

6 years agoMerge "Remove data binding from platform docs"
Yigit Boyar [Tue, 12 Dec 2017 20:37:47 +0000 (20:37 +0000)]
Merge "Remove data binding from platform docs"

6 years agoFix android.text.format.FormatterText expectation
Siyamed Sinir [Tue, 12 Dec 2017 20:37:00 +0000 (12:37 -0800)]
Fix android.text.format.FormatterText expectation

Test: bit FrameworksCoreTests:android.text.format.FormatterTest
Bug: 70506734
Change-Id: Idb621e5deb34694765101234a080653b31e6d897

6 years agoMerge "Make BluetoothPbap implement BluetoothProfile (1/3)" am: 5b6b73800c am: 64d81fbf33
Hansong Zhang [Tue, 12 Dec 2017 19:35:42 +0000 (19:35 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" am: 5b6b73800c am: 64d81fbf33
am: 9c6044771f

Change-Id: I0390d33d0d56b29e3632a4fe78106fcae4fcfb32

6 years agoAdds getPort (hidden) to AudioDeviceInfo class
Hongwei Wang [Wed, 6 Dec 2017 19:35:44 +0000 (11:35 -0800)]
Adds getPort (hidden) to AudioDeviceInfo class

Motivation of this change:

In CarAudioService, we enumerate the AudioDeviceInfo on device via
AudioManager.getDevices(). The AudioDeviceInfo would be used to
construct the dynamic routing via AudioMix.Builder, which accepts
AudioDeviceInfo.

Meanwhile, we wire also the volume change to hal via
AudioManager.setAudioPortConfig(), which accepts AudioPort.

Bug: 65751827
Test: lunch bat_land-userdebug && m -j
Change-Id: I438cfd61e502340def5376fe373a296ab69ff86e

6 years agoMerge "Make BluetoothPbap implement BluetoothProfile (1/3)" am: 5b6b73800c
Hansong Zhang [Tue, 12 Dec 2017 19:22:12 +0000 (19:22 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)" am: 5b6b73800c
am: 64d81fbf33

Change-Id: I1be05324ec0134c801de08e0f60139c341261f33

6 years agoMerge "Make BluetoothPbap implement BluetoothProfile (1/3)"
Hansong Zhang [Tue, 12 Dec 2017 19:11:56 +0000 (19:11 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)"
am: 5b6b73800c

Change-Id: I29c61bf210b8bb01c3a51a12dca4e8a6d3e0d9e1

6 years agoMerge "Make BluetoothPbap implement BluetoothProfile (1/3)"
Treehugger Robot [Tue, 12 Dec 2017 19:02:25 +0000 (19:02 +0000)]
Merge "Make BluetoothPbap implement BluetoothProfile (1/3)"

6 years agoMerge "Moved data connection response into system api." am: 8ded1cde4a am: 88aa63a6a2
Jack Yu [Tue, 12 Dec 2017 18:52:10 +0000 (18:52 +0000)]
Merge "Moved data connection response into system api." am: 8ded1cde4a am: 88aa63a6a2
am: 520b5df6bc  -s ours

Change-Id: Ie6110349f2331818583af66adc93610d8145b552

6 years agoMerge "Add DevicePolicyManager.isEphemeralUser"
TreeHugger Robot [Tue, 12 Dec 2017 18:40:04 +0000 (18:40 +0000)]
Merge "Add DevicePolicyManager.isEphemeralUser"

6 years agoMerge "Fixed an issue where the statusbar wouldn't expand properly"
Selim Cinek [Tue, 12 Dec 2017 18:35:56 +0000 (18:35 +0000)]
Merge "Fixed an issue where the statusbar wouldn't expand properly"

6 years agoMerge "Moved data connection response into system api." am: 8ded1cde4a
Jack Yu [Tue, 12 Dec 2017 18:29:04 +0000 (18:29 +0000)]
Merge "Moved data connection response into system api." am: 8ded1cde4a
am: 88aa63a6a2

Change-Id: Iac46d7f4c0d6c8d46df77c6349b325b5dd5831b3

6 years agoMerge "Add AndroidTest.xml to incident_helper and incidentd"
Yi Jin [Tue, 12 Dec 2017 18:24:52 +0000 (18:24 +0000)]
Merge "Add AndroidTest.xml to incident_helper and incidentd"

6 years agoMerge "Moved data connection response into system api."
Jack Yu [Tue, 12 Dec 2017 18:18:09 +0000 (18:18 +0000)]
Merge "Moved data connection response into system api."
am: 8ded1cde4a

Change-Id: Ibcd8c9c11459e39ea8ba32f9bb680716c1ac9b0d

6 years agoMerge "Moved data connection response into system api."
Treehugger Robot [Tue, 12 Dec 2017 18:04:10 +0000 (18:04 +0000)]
Merge "Moved data connection response into system api."

6 years agoMerge "Migrate disk directory from /data/system/ to /data/misc/"
TreeHugger Robot [Tue, 12 Dec 2017 17:36:34 +0000 (17:36 +0000)]
Merge "Migrate disk directory from /data/system/ to /data/misc/"

6 years agoMerge "Fix bug when generating the textclassifier intent."
TreeHugger Robot [Tue, 12 Dec 2017 17:35:25 +0000 (17:35 +0000)]
Merge "Fix bug when generating the textclassifier intent."

6 years agoMerge "Define an App Op for REQUEST_DELETE_PACKAGES."
Peter Visontay [Tue, 12 Dec 2017 17:27:46 +0000 (17:27 +0000)]
Merge "Define an App Op for REQUEST_DELETE_PACKAGES."

6 years agoDisplayCutout: Only dispatch to apps requesting it
Adrian Roos [Tue, 12 Dec 2017 15:07:55 +0000 (16:07 +0100)]
DisplayCutout: Only dispatch to apps requesting it

Fixes a compatibility issues, where apps that were not expecting
a cutout were dispatched one anyway, which caused the WindowInsets
dispatch to continue down the hierarchy even though the SystemInsets
were consumed by the app.

To avoid this, we pre-emptively consume the cutout for any apps that
did not request to be laid out in the cutout area. This is safe,
because for apps that don't request it, the status bar will take care
of consuming it, or they won't be laid out in the cutout at all.

If apps still need to know where the cutout is, they can query for it
via View.getRootWindowInsets().

Fixes: 65689439
Bug: 70490585
Test: atest android.view.cts.DisplayCutoutTest
Change-Id: If06674c619f095d4105be1b3a511fb5823b63d2b

6 years agoMerge "Add Slice.Builder#addBundle"
TreeHugger Robot [Tue, 12 Dec 2017 16:44:13 +0000 (16:44 +0000)]
Merge "Add Slice.Builder#addBundle"

6 years agoMerge "Introduce PremeasuredText"
Seigo Nonaka [Tue, 12 Dec 2017 16:40:27 +0000 (16:40 +0000)]
Merge "Introduce PremeasuredText"

6 years agoMerge "Add brightness slider events to dumpsys."
Kenny Guy [Tue, 12 Dec 2017 16:24:06 +0000 (16:24 +0000)]
Merge "Add brightness slider events to dumpsys."

6 years agoMerge "Block the upgrade of persistent apps" am: 0b30d95dc8 am: 6de91158d7
Todd Kennedy [Tue, 12 Dec 2017 15:54:19 +0000 (15:54 +0000)]
Merge "Block the upgrade of persistent apps" am: 0b30d95dc8 am: 6de91158d7
am: 3175c621da

Change-Id: I5319cc775e7381e697ae365cdf7433d4bfdf56bd

6 years agoMerge "Add a shell command to reset selected/enabled IMEs"
TreeHugger Robot [Tue, 12 Dec 2017 15:28:32 +0000 (15:28 +0000)]
Merge "Add a shell command to reset selected/enabled IMEs"

6 years agoMerge "Block the upgrade of persistent apps" am: 0b30d95dc8
Todd Kennedy [Tue, 12 Dec 2017 15:14:20 +0000 (15:14 +0000)]
Merge "Block the upgrade of persistent apps" am: 0b30d95dc8
am: 6de91158d7

Change-Id: I729df40376b972461908d22593b63f4f5399e356

6 years agoMerge "Block the upgrade of persistent apps"
Todd Kennedy [Tue, 12 Dec 2017 15:05:24 +0000 (15:05 +0000)]
Merge "Block the upgrade of persistent apps"
am: 0b30d95dc8

Change-Id: Icd375c367293169b2d2f7661fcb337cafd324714

6 years agoMerge "Block the upgrade of persistent apps"
Todd Kennedy [Tue, 12 Dec 2017 14:55:01 +0000 (14:55 +0000)]
Merge "Block the upgrade of persistent apps"

6 years agoMerge "Use IBinder#shellCommand() for 'adb shell ime'"
TreeHugger Robot [Tue, 12 Dec 2017 14:49:25 +0000 (14:49 +0000)]
Merge "Use IBinder#shellCommand() for 'adb shell ime'"

6 years agoAdd Slice.Builder#addBundle
Jason Monk [Fri, 8 Dec 2017 23:19:32 +0000 (18:19 -0500)]
Add Slice.Builder#addBundle

Its for support lib expansion in the future, not for dev use.

Bug: 68378561
Test: atest cts/tests/tests/slice
Change-Id: Ifc73e56c391bd4abed3b8db3c597d7dc794c1a3c

6 years agoMerge "Remove LOCAL_STATIC_SHARED_LIBRARY usage" am: 60f0b06d19 am: 6ff2ad3044
Paul Duffin [Tue, 12 Dec 2017 13:32:38 +0000 (13:32 +0000)]
Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage" am: 60f0b06d19 am: 6ff2ad3044
am: 1c091ba045

Change-Id: I1a6d1130de87ef0a69727a7c7a7950704df47c04

6 years agoMerge "AAPT2: allow to generate R.txt without R.java"
TreeHugger Robot [Tue, 12 Dec 2017 13:21:05 +0000 (13:21 +0000)]
Merge "AAPT2: allow to generate R.txt without R.java"

6 years agoMerge "Remove LOCAL_STATIC_SHARED_LIBRARY usage" am: 60f0b06d19
Paul Duffin [Tue, 12 Dec 2017 13:19:26 +0000 (13:19 +0000)]
Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage" am: 60f0b06d19
am: 6ff2ad3044

Change-Id: I7ec4ac17b4fead69b3ffbd754cd3ce33978c64cb

6 years agoMerge "Replace legacy-android-test with android.test.base"
TreeHugger Robot [Tue, 12 Dec 2017 13:17:38 +0000 (13:17 +0000)]
Merge "Replace legacy-android-test with android.test.base"

6 years agoMerge "Remove LOCAL_STATIC_SHARED_LIBRARY usage"
Paul Duffin [Tue, 12 Dec 2017 13:09:48 +0000 (13:09 +0000)]
Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage"
am: 60f0b06d19

Change-Id: I530df72ef5dc2c50a2304e5b2fe1ddff2ade2eeb

6 years agoMerge "Remove LOCAL_STATIC_SHARED_LIBRARY usage"
Treehugger Robot [Tue, 12 Dec 2017 12:55:28 +0000 (12:55 +0000)]
Merge "Remove LOCAL_STATIC_SHARED_LIBRARY usage"

6 years agoMerge "Stop statically including legacy-android-test"
Paul Duffin [Tue, 12 Dec 2017 11:32:11 +0000 (11:32 +0000)]
Merge "Stop statically including legacy-android-test"

6 years agoMerge "Build test-runner/tests"
Paul Duffin [Tue, 12 Dec 2017 11:31:06 +0000 (11:31 +0000)]
Merge "Build test-runner/tests"

6 years agoMerge "Add NotificationRemoteInputManager and associated tests."
TreeHugger Robot [Tue, 12 Dec 2017 09:39:42 +0000 (09:39 +0000)]
Merge "Add NotificationRemoteInputManager and associated tests."

6 years agoMigrate disk directory from /data/system/ to /data/misc/
yro [Tue, 12 Dec 2017 08:17:50 +0000 (00:17 -0800)]
Migrate disk directory from /data/system/ to /data/misc/

Test: statsd, statsd_test
Change-Id: I6d2fe97afd79fb9b36d180d5e6e6a7a166a228b7

6 years agoAdd NotificationRemoteInputManager and associated tests.
Eliot Courtney [Wed, 15 Nov 2017 05:25:21 +0000 (14:25 +0900)]
Add NotificationRemoteInputManager and associated tests.

This splits out several remote input related pieces of logic:
  1. Handling clicks on remote views
  2. Handling notifications kept for remote input
  3. Handling notifications to be removed on NotificationPresenter
      collapse.

Bug: 63874929
Bug: 62602530
Test: runtest systemui
Test: Compile and run
Change-Id: I7acd4bcb2ab7bde67d307408f509d3ca038eb3d4

6 years agoAvoid flickering when unlocking with fingerprint
Lucas Dupin [Mon, 11 Dec 2017 22:40:07 +0000 (14:40 -0800)]
Avoid flickering when unlocking with fingerprint

Fixes issue where scrim state could be set to KEYGUARD
for 1 frame and user would see the notification shade.

Change-Id: I577b969f98573fc481e3d7c283eb5b612b7e5cee
Fixes: 70210651
Test: Unlock with fingerprint from AoD
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java

6 years agoMerge "Add support for seamless transion from/to AoD"
Lucas Dupin [Tue, 12 Dec 2017 06:36:30 +0000 (06:36 +0000)]
Merge "Add support for seamless transion from/to AoD"

6 years agoMerge "Nullcheck to fix Autofill CTS"
TreeHugger Robot [Tue, 12 Dec 2017 05:47:48 +0000 (05:47 +0000)]
Merge "Nullcheck to fix Autofill CTS"

6 years agoMerge "Fix missed use of old int version code in shortcut manager."
TreeHugger Robot [Tue, 12 Dec 2017 05:06:02 +0000 (05:06 +0000)]
Merge "Fix missed use of old int version code in shortcut manager."

6 years agoMerge "Update WebView tests to use long version codes."
TreeHugger Robot [Tue, 12 Dec 2017 04:58:53 +0000 (04:58 +0000)]
Merge "Update WebView tests to use long version codes."

6 years agoMerge "Fix an incorrect display position of error popup in RTL layout" am: b7941c50a0...
Siyamed Sinir [Tue, 12 Dec 2017 04:39:15 +0000 (04:39 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout" am: b7941c50a0 am: 0863cf4e40
am: 8fc08cc0f6

Change-Id: I96476450550e726c3ac6c07e39afcd175cfee043

6 years agoMerge "incidentd: Updating field IDs and a field name."
TreeHugger Robot [Tue, 12 Dec 2017 04:30:11 +0000 (04:30 +0000)]
Merge "incidentd: Updating field IDs and a field name."

6 years agoMerge "Fix an incorrect display position of error popup in RTL layout" am: b7941c50a0
Siyamed Sinir [Tue, 12 Dec 2017 04:25:54 +0000 (04:25 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout" am: b7941c50a0
am: 0863cf4e40

Change-Id: Ief495fcc7e6f711696ed6337ab65face9d03c981

6 years agoMerge "Update graphics stats to use long version codes."
TreeHugger Robot [Tue, 12 Dec 2017 04:20:46 +0000 (04:20 +0000)]
Merge "Update graphics stats to use long version codes."

6 years agoMerge "Fix an incorrect display position of error popup in RTL layout"
Siyamed Sinir [Tue, 12 Dec 2017 04:15:03 +0000 (04:15 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout"
am: b7941c50a0

Change-Id: I67578129771d0c7d52d5da63f24c2f0d6081ab57

6 years agoMerge "Avoid strict mode violation in shortcut manager on user-unlock"
TreeHugger Robot [Tue, 12 Dec 2017 04:03:21 +0000 (04:03 +0000)]
Merge "Avoid strict mode violation in shortcut manager on user-unlock"

6 years agoMerge "Fix an incorrect display position of error popup in RTL layout"
Siyamed Sinir [Tue, 12 Dec 2017 03:57:43 +0000 (03:57 +0000)]
Merge "Fix an incorrect display position of error popup in RTL layout"

6 years agoIntroduce PremeasuredText
Seigo Nonaka [Sun, 3 Dec 2017 03:28:05 +0000 (19:28 -0800)]
Introduce PremeasuredText

By measuring the character widths beforehand, we can save at least 40%
of the StaticLayout construction time which typically happens on UI
thread.
Also verified this doesn't cause performance regression for not
premeasured text.

Raw performance score (Not premeasured -> premeasured, median, N=100)

No Style,   Greedy, Hyphenation OFF:  7,812,975 ->    503,245 (-93.6%)
No Style, Balanced, Hyphenation OFF:  7,843,254 ->    396,892 (-95.0%)

No Style,   Greedy, Hyphenation ON : 19,134,214 -> 11,658,928 (-39.1%)
No Style, Balanced, Hyphenation ON : 19,348,062 -> 11,634,942 (-39.9%)

Styled,     Greedy, Hyphenation OFF: 14,353,673 ->    572,840 (-96.0%)

Raw performance score (w/o patch -> w/ patch, median, N=100):

No Style,   Greedy, Hyphenation OFF:  7,732,894 ->  7,812,975 (+1.04%)
No Style, Balanced, Hyphenation OFF:  7,884,510 ->  7,843,254 (-0.52%)

No Style,   Greedy, Hyphenation ON : 18,986,958 -> 19,134,214 (+0.78%)
No Style, Balanced, Hyphenation ON : 19,232,791 -> 19,348,062 (+0.60%)

Styled,     Greedy, Hyphenation OFF: 14,319,690 -> 14,353,673 (+0.24%)

Bug: 67504091
Test: bit CtsTextTestCases:*
Test: bit CtsGraphicsTestCases:*
Test: bit CtsWidgetTestCases:*
Test: FrameworksCoreTests:android.text.MeasuredTextTest
Change-Id: I0b46f04b42cc012606a9c722eca0d51147a0dcc7

6 years agoMerge "Add CarrierConfig key for RTT support" am: e5a913661d am: 79dc6fb815
Hall Liu [Tue, 12 Dec 2017 02:46:53 +0000 (02:46 +0000)]
Merge "Add CarrierConfig key for RTT support" am: e5a913661d am: 79dc6fb815
am: 6365fde4c0

Change-Id: I652fb64918aaf7dbd87910d35329b2752914e937

6 years agoMerge "Revert "Add support for send Message with messaging options"" am: 563d93c107...
Amit Mahajan [Tue, 12 Dec 2017 02:32:54 +0000 (02:32 +0000)]
Merge "Revert "Add support for send Message with messaging options"" am: 563d93c107 am: b1ba135258
am: 339c512db0

Change-Id: I0539d1f7db3a307f7fb0b27e0b2a3a3e13a71538

6 years agoMerge "Fixed an issue with font sizes between users"
Selim Cinek [Tue, 12 Dec 2017 02:24:22 +0000 (02:24 +0000)]
Merge "Fixed an issue with font sizes between users"

6 years agoMerge "Proper autofill fix to let phone process autofill Settings activity."
TreeHugger Robot [Tue, 12 Dec 2017 02:21:59 +0000 (02:21 +0000)]
Merge "Proper autofill fix to let phone process autofill Settings activity."

6 years agoMerge "Fix cancelSync() permission check for periodic syncs."
TreeHugger Robot [Tue, 12 Dec 2017 02:20:58 +0000 (02:20 +0000)]
Merge "Fix cancelSync() permission check for periodic syncs."

6 years agoMerge "Add CarrierConfig key for RTT support" am: e5a913661d
Hall Liu [Tue, 12 Dec 2017 02:11:04 +0000 (02:11 +0000)]
Merge "Add CarrierConfig key for RTT support" am: e5a913661d
am: 79dc6fb815

Change-Id: I11ef3f96e578e077288fe60725d326a20f45daf1

6 years agoMerge "Convert screenshot hw Bitmap to sw Bitmap for screenshot preview."
TreeHugger Robot [Tue, 12 Dec 2017 02:07:10 +0000 (02:07 +0000)]
Merge "Convert screenshot hw Bitmap to sw Bitmap for screenshot preview."

6 years agoMerge "Don't write log on AM thread."
TreeHugger Robot [Tue, 12 Dec 2017 02:05:52 +0000 (02:05 +0000)]
Merge "Don't write log on AM thread."

6 years agoincidentd: Updating field IDs and a field name.
Kweku Adams [Tue, 12 Dec 2017 02:05:38 +0000 (18:05 -0800)]
incidentd: Updating field IDs and a field name.

Field 7 was removed in http://ag/3248090. Since the protos aren't being
used yet, I want to update the rest of the IDs to avoid confusion in the
future when they start being used.
Also updated a field name to better reflect what the value is.

Bug: 65750801
Test: $ cts-tradefed run cts-dev --module CtsIncidentHostTestCases --test com.android.server.cts.AlarmManagerIncidentTest
Change-Id: I48724d461fa2e68dfaf452f01a84031d9fa4180e

6 years agoMerge "Add CarrierConfig key for RTT support"
Hall Liu [Tue, 12 Dec 2017 01:59:47 +0000 (01:59 +0000)]
Merge "Add CarrierConfig key for RTT support"
am: e5a913661d

Change-Id: I035f9ae243dfe1a8c3bc1300851e88fdcb73dafd

6 years agoAdd a shell command to reset selected/enabled IMEs
Yohei Yukawa [Tue, 12 Dec 2017 01:54:43 +0000 (17:54 -0800)]
Add a shell command to reset selected/enabled IMEs

With this CL, you can reset currently selected/enabled IMEs with a shell
command as follows:
  adb shell ime reset-ime

This should be useful for end-to-end tests where often we want to clean
up persistent IME state to the default ones as if the device is
initially booted.

Fixes: 70475949
Test: Manually tested as follows:
  1. make -j SoftKeyboard
  2. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
  3. adb shell ime enable com.example.android.softkeyboard/.SoftKeyboard
  4. adb shell ime set com.example.android.softkeyboard/.SoftKeyboard
  5. Make sure that SoftKeyboard is enabled and selected
  6. adb shell ime reset-ime
  7. Make sure that SoftKeyboard is no longer enabled and selected
Change-Id: I1e27aa1c9edf5d9a6d529c469ad42fd1e42b13b1

6 years agoMerge "Add Text APCT tests to Presubmit"
Siyamed Sinir [Tue, 12 Dec 2017 01:53:04 +0000 (01:53 +0000)]
Merge "Add Text APCT tests to Presubmit"

6 years agoMerge "Add CarrierConfig key for RTT support"
Hall Liu [Tue, 12 Dec 2017 01:44:08 +0000 (01:44 +0000)]
Merge "Add CarrierConfig key for RTT support"

6 years agoMerge "Merge "Add carrier config to always play hold tone when remotely held." am...
Android Build Merger (Role) [Tue, 12 Dec 2017 01:43:22 +0000 (01:43 +0000)]
Merge "Merge "Add carrier config to always play hold tone when remotely held." am: c352f5f861 am: c9187f9199 am: e31e0d5a7a"

6 years agoMerge "Don't take mLock in handleUnlockUser()."
TreeHugger Robot [Tue, 12 Dec 2017 01:40:24 +0000 (01:40 +0000)]
Merge "Don't take mLock in handleUnlockUser()."

6 years agoMerge "Add carrier config to always play hold tone when remotely held." am: c352f5f86...
Tyler Gunn [Tue, 12 Dec 2017 01:40:08 +0000 (01:40 +0000)]
Merge "Add carrier config to always play hold tone when remotely held." am: c352f5f861 am: c9187f9199
am: e31e0d5a7a

Change-Id: Ic14315ea8a85fe9108e765fb32ce23b68ff31756

6 years agoMerge "Revert "Add support for send Message with messaging options"" am: 563d93c107
Amit Mahajan [Tue, 12 Dec 2017 01:37:32 +0000 (01:37 +0000)]
Merge "Revert "Add support for send Message with messaging options"" am: 563d93c107
am: b1ba135258

Change-Id: I874df0b3061ef2f22de6d1c5f9338aa395092ee8

6 years agoMerge "Make TelephonyManager#getEmergencyCallbackMode SystemApi"
TreeHugger Robot [Tue, 12 Dec 2017 01:30:03 +0000 (01:30 +0000)]
Merge "Make TelephonyManager#getEmergencyCallbackMode SystemApi"

6 years agoMerge "Add carrier config to always play hold tone when remotely held." am: c352f5f861
Tyler Gunn [Tue, 12 Dec 2017 01:27:00 +0000 (01:27 +0000)]
Merge "Add carrier config to always play hold tone when remotely held." am: c352f5f861
am: c9187f9199

Change-Id: Ic5b3a6089b03771bb0c0e48e0e8e01cbca839b47

6 years agoMerge "Revert "Add support for send Message with messaging options""
Amit Mahajan [Tue, 12 Dec 2017 01:26:00 +0000 (01:26 +0000)]
Merge "Revert "Add support for send Message with messaging options""
am: 563d93c107

Change-Id: I5db31fdbddfdceb5417f617d7856f8a2a85cedb4

6 years agoUse IBinder#shellCommand() for 'adb shell ime'
Yohei Yukawa [Tue, 12 Dec 2017 01:24:55 +0000 (17:24 -0800)]
Use IBinder#shellCommand() for 'adb shell ime'

This is a preparation CL to add a new command to 'adb shell ime'.

Currently 'ime' command is written in Java language that relies directly
on the internal Binder IPC interface IInputMethodManager.

This is not ideal because:

 1. We have to keep maintaining IInputMethodManager methods used
    only by the 'ime' command.
 2. Adding new options to the 'ime' command is tedious when it
    requires new methods in IInputMethodManager.

With this CL, all features of 'ime' command are re-implemented inside
InputMethodManagerService (IMMS) on top of Binder's "shell command"
feature [1].  Like 'am' command was gone recently [2], now 'ime' command
is also a simple shell wrapper to forward options to 'cmd input_method',
which allows us to 1) reduce the code duplication and 2) give non-zero
status code when the command fails with Java exception.

 [1]: I76518ea6719d1d08a8ad8722a059c7f5fd86813a
      9461b6f91f37fd32207da1bd734d9ea9629eb8e5
 [2]: Ia8187196af597046fd2e7092dbf19ce1dc1ea457
      1704e3cf0c445512f0a9644485dd3449e874556b

Bug: 70475949
Test: adb shell ime
Test: adb shell ime help
Test: adb shell ime dump
Test: adb shell ime list -a
Test: adb shell cmd input_method
Test: adb shell cmd input_method help
Test: adb shell cmd input_method dump
Test: adb shell cmd input_method list -a
Change-Id: I9a2dbbf1d4494addbe22c82e2c416eedc4d585f2

6 years agoMerge "Refactor system properties protos to just include the list treble team defines...
TreeHugger Robot [Tue, 12 Dec 2017 01:19:46 +0000 (01:19 +0000)]
Merge "Refactor system properties protos to just include the list treble team defines go/treble-sysprop-compatibility."

6 years agoMerge "Add carrier config to always play hold tone when remotely held."
Tyler Gunn [Tue, 12 Dec 2017 01:16:30 +0000 (01:16 +0000)]
Merge "Add carrier config to always play hold tone when remotely held."
am: c352f5f861

Change-Id: I16a53c2ec034c32c9e771e367c18ab20c1a52cf4

6 years agoMerge "incidentd: Removing history from batterystats dump."
TreeHugger Robot [Tue, 12 Dec 2017 01:04:57 +0000 (01:04 +0000)]
Merge "incidentd: Removing history from batterystats dump."

6 years agoMerge "Revert "Add support for send Message with messaging options""
Amit Mahajan [Tue, 12 Dec 2017 01:04:54 +0000 (01:04 +0000)]
Merge "Revert "Add support for send Message with messaging options""

6 years agoMerge "Migrate IME related tests to JUnit4"
TreeHugger Robot [Tue, 12 Dec 2017 01:03:51 +0000 (01:03 +0000)]
Merge "Migrate IME related tests to JUnit4"

6 years agoMerge "Add carrier config to always play hold tone when remotely held."
Treehugger Robot [Tue, 12 Dec 2017 00:56:37 +0000 (00:56 +0000)]
Merge "Add carrier config to always play hold tone when remotely held."

6 years agoUpdate WebView tests to use long version codes.
Dianne Hackborn [Tue, 12 Dec 2017 00:54:27 +0000 (16:54 -0800)]
Update WebView tests to use long version codes.

Bug: 64459786
Test: manual
Change-Id: Ib4b8f8f10f2321663a55e086d39586fbdca93a54

6 years agoAvoid strict mode violation in shortcut manager on user-unlock
Makoto Onuki [Tue, 12 Dec 2017 00:38:11 +0000 (16:38 -0800)]
Avoid strict mode violation in shortcut manager on user-unlock

- The issue is the shortcut host information was stored in ShortcutUser, which
is per-user shortcut information that's persisted in the disk. Even though in
the onUnlockUser sequence we only need to "set" a package name, in order to
access the ShortcutUser instance for the target user, we'd need to load the
per-user information from the disk.

- Luckily the host packages don't need to be persisted, so let's just move
it to another structure which is just kept in memory.

Bug: 70526858
Test: Manual test (boot, unlock user, unlock secondary user)
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsShortcutManagerTestCases
Change-Id: Ic4b842c4a3a08a7f0e678ce328e9d4ee08fd4069

6 years agoMerge "Cancel alarms & jobs when an app's data is cleared"
TreeHugger Robot [Tue, 12 Dec 2017 00:48:22 +0000 (00:48 +0000)]
Merge "Cancel alarms & jobs when an app's data is cleared"

6 years agoFix missed use of old int version code in shortcut manager.
Dianne Hackborn [Tue, 12 Dec 2017 00:44:08 +0000 (16:44 -0800)]
Fix missed use of old int version code in shortcut manager.

Bug: 64459786
Test: manual
Change-Id: If0f8a19e72e259cceec71ba3490204298e38a478

6 years agoMerge "Fix package manager tests"
Todd Kennedy [Tue, 12 Dec 2017 00:37:35 +0000 (00:37 +0000)]
Merge "Fix package manager tests"

6 years agoFixed an issue where the statusbar wouldn't expand properly
Selim Cinek [Fri, 8 Dec 2017 00:31:03 +0000 (16:31 -0800)]
Fixed an issue where the statusbar wouldn't expand properly

Because we were measuring the notification in the wrong state,
the contentheight could be wrong. This should fix several other
issues related to redaction.

Change-Id: I15f2cb6b7c2880b0771db67360c24431b8471e0d
Fixes: 69927267
Test: Unlock lockscreen, drag down quickly with fingerprint, normal display

6 years agoUpdate graphics stats to use long version codes.
Dianne Hackborn [Tue, 12 Dec 2017 00:30:36 +0000 (16:30 -0800)]
Update graphics stats to use long version codes.

Bug: 64459786
Test: manual
Change-Id: Iab84727e0ac486f505c10aacdb5ec8871aaf121e

6 years agoProper autofill fix to let phone process autofill Settings activity.
Felipe Leme [Mon, 11 Dec 2017 22:37:35 +0000 (14:37 -0800)]
Proper autofill fix to let phone process autofill Settings activity.

Test: adb shell am start com.android.settings/.RadioInfo
Fixes: 70506888

Change-Id: Id29bad2d20b621f7379eb6144c95dcc819949b3d

6 years agoMerge "Carrier confirmation code." am: 6627d2c4df am: 0e788e00b6
Holly Jiuyu Sun [Tue, 12 Dec 2017 00:12:44 +0000 (00:12 +0000)]
Merge "Carrier confirmation code." am: 6627d2c4df am: 0e788e00b6
am: 486385092b  -s ours

Change-Id: I34d9496ee29684f5a1ceb6c9ab01ad87ffe72e8d

6 years agoMerge "Add Chromium ARC EventLogTags"
TreeHugger Robot [Tue, 12 Dec 2017 00:03:56 +0000 (00:03 +0000)]
Merge "Add Chromium ARC EventLogTags"

6 years agoMerge "SoundPool: remove unused header file."
TreeHugger Robot [Tue, 12 Dec 2017 00:00:34 +0000 (00:00 +0000)]
Merge "SoundPool: remove unused header file."

6 years agoDon't write log on AM thread.
Makoto Onuki [Mon, 11 Dec 2017 23:50:58 +0000 (15:50 -0800)]
Don't write log on AM thread.

Bug: 68871851
Test: Manual test with boot+logcat
Change-Id: I456036785ae92d8cc9b5c22120513f089f4386bd

6 years agoMerge "Carrier confirmation code." am: 6627d2c4df
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:58:48 +0000 (23:58 +0000)]
Merge "Carrier confirmation code." am: 6627d2c4df
am: 0e788e00b6

Change-Id: Ibbb439b724ee031b76ff42ecd84c3c1f2df69ae1

6 years agoMerge "Carrier confirmation code."
Holly Jiuyu Sun [Mon, 11 Dec 2017 23:48:04 +0000 (23:48 +0000)]
Merge "Carrier confirmation code."
am: 6627d2c4df

Change-Id: I444b27d11472cd9a84e4df3b5ae624fba0b13e71

6 years agoDon't take mLock in handleUnlockUser().
Makoto Onuki [Mon, 11 Dec 2017 22:47:19 +0000 (14:47 -0800)]
Don't take mLock in handleUnlockUser().

Bug: 64303666
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest1 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest2 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest3 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest4 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest5 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest6 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest7 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest8 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest9 -w com.android.frameworks.servicestests
Test: adb shell am instrument -w -e class com.android.server.pm.ShortcutManagerTest10 -w com.android.frameworks.servicestests
Change-Id: I3afb814714aae404e4f07d8b179f4598cf507af5

6 years agoAdd Text APCT tests to Presubmit
Siyamed Sinir [Mon, 11 Dec 2017 23:29:18 +0000 (15:29 -0800)]
Add Text APCT tests to Presubmit

Ignored flaky tests. Test currently ignored are:
- android.text.format.FormatterTest
- android.util.util.LinkifyTest
- android.text.LineBreakingOverhangsTest

Test: None
Bug: 70506734
Change-Id: I6ef535c609d99fc6ff4a7887353b1df5ae7dcacb

6 years agoNullcheck to fix Autofill CTS
Eugene Susla [Mon, 11 Dec 2017 18:07:03 +0000 (10:07 -0800)]
Nullcheck to fix Autofill CTS

Test: presubmit
Fixes: 70506475
Change-Id: I187bed4889a4901a7137a2995178ea651ed09186