Commit Graph

326029 Commits

Author SHA1 Message Date
Daniel Sheng
18c44c5b08 Merge "Changed camera lift trigger to default-on." 2017-06-06 23:26:10 +00:00
Marco Nelissen
3272cf26c1 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64 am: 4b78a79546
am: 6d5bc9a3c2

Change-Id: I8165c2218d0d5de41468f8acff86a720c03d1f52
2017-06-06 23:22:14 +00:00
Marco Nelissen
6d5bc9a3c2 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb am: 5181a7ab64
am: 4b78a79546

Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8
2017-06-06 23:16:24 +00:00
qingxi
12f2de4f4f Only show the "Disable eSIM" when eSIM profile is enabled
Before this CL, we always show "Disable eSIM" button in SIM lock screen
if the device has eSIM chip. This may make the user who has never used
eSIM or currently is not activated the eSIM Profile confused. This CL
makes the "Disable eSIM" button only be shown iff the device has eSIM
chip and the current activated Profile is eSIM profile.

Bug: 37518023
Test: E2E
Change-Id: Id5a1325f49733528a370ec7145fe49731243bcf7
2017-06-06 16:12:06 -07:00
Selim Cinek
2e59523ce6 Merge "Fixed an issue where would could be left with empty notifications" into oc-dev am: 25e509462f
am: b8c7c9ee2d

Change-Id: I8560e900e1c0c2cf7caf1ba748a5b928ff69f638
2017-06-06 23:11:15 +00:00
Marco Nelissen
4b78a79546 Merge "Close connection before retrying" into lmp-dev am: a8648ecebb
am: 5181a7ab64

Change-Id: I34a176a0da235836eaa9e44b843ec5d5654b8db9
2017-06-06 23:10:16 +00:00
TreeHugger Robot
d525148c98 Merge "Add logging to track search no-result case" 2017-06-06 23:04:04 +00:00
Selim Cinek
b8c7c9ee2d Merge "Fixed an issue where would could be left with empty notifications" into oc-dev
am: 25e509462f

Change-Id: I69457f9a26085bc98e24b0c975106ddaa3199e98
2017-06-06 23:02:41 +00:00
Marco Nelissen
5181a7ab64 Merge "Close connection before retrying" into lmp-dev
am: a8648ecebb

Change-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74
2017-06-06 23:02:35 +00:00
Daniel Sandler
059e6eb632 Merge "resolve merge conflicts of be23ef368f to oc-dev-plus-aosp" into oc-dev-plus-aosp
am: 9dd289529d

Change-Id: Ic2151c9a6a4f8ff1d76effa5b935ffa3e43bb0d8
2017-06-06 23:00:53 +00:00
TreeHugger Robot
25e509462f Merge "Fixed an issue where would could be left with empty notifications" into oc-dev 2017-06-06 22:54:43 +00:00
TreeHugger Robot
a8648ecebb Merge "Close connection before retrying" into lmp-dev 2017-06-06 22:54:01 +00:00
Daniel Sandler
9dd289529d Merge "resolve merge conflicts of be23ef368f to oc-dev-plus-aosp" into oc-dev-plus-aosp 2017-06-06 22:53:07 +00:00
Roozbeh Pournader
de0353dbc7 Replace mockito with a mock class in DynamicLayoutTest
Previously, a mocked object was used incorrectly in the test. It was
attached twice as a span, which would result in the second identical
span causing the first span to get removed.

Now we use two different instances of a mock class, to make sure we
are attaching different spans.

Fixes: 62217995
Test: adb shell am instrument -w -e package android.text com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner

Change-Id: Ib9f7a467410d28280d77a1023e0fc328c652e2af
2017-06-06 15:49:42 -07:00
Hyunyoung Song
c9edec2bf7 Change Android default icon
b/35314247
Test: manual

Change-Id: I50964e616565e2e766f903a2a28de7194908bd7b
2017-06-06 15:39:21 -07:00
Tyler Gunn
02212db446 Add carrier config for allowing USSD requests via telephony manger APIs.
Test: Manual
Bug: 62293605
Change-Id: I713df20c7faffb16df6c74d5f62a7023a3e35439
2017-06-06 15:37:18 -07:00
Sudheer Shanka
6d8dcec872 Update KernelUidCpuFreqTimeReader to handle uid removals.
Bug: 34133340
Test: manual
Change-Id: Iaad2061671d83e1ff6d2797e166ae903f6faec13
2017-06-06 15:31:51 -07:00
Keyvan Amiri
33089c090b Merge "Disabled task snapshot for TV" into oc-dev am: 08b953dd2e
am: 6cae189d26

Change-Id: I4c71d58c3f9d640abaa941324c570c6168002cad
2017-06-06 22:13:48 +00:00
sunjian
b6fb6f2b60 Update AccountManagerService side logic for .getAccountsByTypeForPackage with null type. am: d62dc39dc5
am: b22429d53f

Change-Id: I40675817d0102c51a4ad4988bc4c1445842883b3
2017-06-06 22:11:19 +00:00
Keyvan Amiri
6cae189d26 Merge "Disabled task snapshot for TV" into oc-dev
am: 08b953dd2e

Change-Id: I220460741e82abbfaf3746763cbb4b09e9357965
2017-06-06 22:05:13 +00:00
Jeff Sharkey
2063e4f6ba Remove old FUSE bypass now that we have sdcardfs.
This forces everyone to go through sdcardfs, instead of letting them
around the back door.

Test: builds, boots
Bug: 38231314, 27992761
Change-Id: I97b24d25599c7f86f9b535689e2f4ecf68261dac
2017-06-06 16:03:26 -06:00
TreeHugger Robot
08b953dd2e Merge "Disabled task snapshot for TV" into oc-dev 2017-06-06 21:56:26 +00:00
sunjian
b22429d53f Update AccountManagerService side logic for .getAccountsByTypeForPackage with null type.
am: d62dc39dc5

Change-Id: Idf3475786676e9713e4fa5756ecce9c675da8c3e
2017-06-06 21:56:07 +00:00
Julius D'souza
44da336ce8 Merge "Add state machine model for skipping initial brightness ramps." into oc-dev am: 9fd3076fe6
am: cc162a1e4f

Change-Id: If743c9ed506aa6e1035303d50c48de7093a8c7e7
2017-06-06 21:48:26 +00:00
sunjian
d62dc39dc5 Update AccountManagerService side logic for .getAccountsByTypeForPackage
with null type.

Bug: 37987384
Test: manual, APCT
Change-Id: I4d5f735736f1b1d7bbf778aee2ec813071c34f19
2017-06-06 21:45:58 +00:00
Aurimas Liutikas
7b62dc3aec Merge "Remove usages of ActionBarActivity." into oc-dev am: c742b8ab2d
am: 964993e9aa

Change-Id: I6f6e5c06b274d55f47483fd4d7bf20d50c08741b
2017-06-06 21:45:45 +00:00
TreeHugger Robot
39d69b84c9 Merge "AAPT2: Do not interpret %n as a format specifier in string resources" 2017-06-06 21:40:00 +00:00
Wale Ogunwale
743fcc1184 Revert "Temporarily enable screen wakelock logging in WM"
This reverts commit efe1b94acd.

Bug: 38416971
Change-Id: I6e038d5a24485a5348de8d1558b94a7b5a31bdaf
Test: No change in logic
2017-06-06 21:36:50 +00:00
Julius D'souza
cc162a1e4f Merge "Add state machine model for skipping initial brightness ramps." into oc-dev
am: 9fd3076fe6

Change-Id: If95a7b60b75f06eb3c67de24b837c26ce259db92
2017-06-06 21:36:50 +00:00
Dan Sandler
f5aafb9e18 Hide redundant foreground service notifications.
If an app with a foreground service has (at least one)
FLAG_FOREGROUND notification shown to the user, we allow
that to satisfy the requirement that the user be informed
about such things. But if the fg notification or its channel
is blocked by the user, we show the NOTE_FOREGROUND_SERVICES
notification (a/k/a Dianne's Dungeon) provided to us by the
activity manager.

Note that if even one of the foreground processes for the
current user is missing its disclosure notification, the
user will see the whole dungeon.

Bug: 36891897
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/ForegroundServiceControllerTest.java
Change-Id: I435b7c01e60f99da162c9ea61656e2991d2cb87c
2017-06-06 17:36:33 -04:00
Dan Sandler
0b5efb3b53 Updates to Dianne's Dungeon.
- new EKG icon
 - set the notification timestamp to the oldest service
   start time, so you have some idea how long things have been
   this way
 - minor text fixes

Bug: 36891897
Test: runtest -x cts/tests/app/src/android/app/cts/ServiceTest.java
Change-Id: I37c76ae86bcaee7c946863add041bbd1ca678cf9
2017-06-06 17:36:26 -04:00
TreeHugger Robot
d131f19c50 Merge "Add new haptic feedback constant for virtual key release." 2017-06-06 21:35:51 +00:00
Felipe Leme
2f6fc72efc Overall improvement on Autofill javadocs for autofillable APIs.
Bug: 37567048
Test: ran 'm -j doc-comment-check-docs' and checked resulting HTML

Change-Id: I7eaf0a521c3777baf0dc0002ae814990fd96a14c
2017-06-06 14:33:56 -07:00
Julius D'souza
9fd3076fe6 Merge "Add state machine model for skipping initial brightness ramps." into oc-dev 2017-06-06 21:29:49 +00:00
Aurimas Liutikas
964993e9aa Merge "Remove usages of ActionBarActivity." into oc-dev
am: c742b8ab2d

Change-Id: Ie10c1ddf16fa238b2e2ee5b0c58b1cff3981433f
2017-06-06 21:29:29 +00:00
TreeHugger Robot
c742b8ab2d Merge "Remove usages of ActionBarActivity." into oc-dev 2017-06-06 21:20:45 +00:00
Michael Wright
640666fcfd Actually wait until the display is ready.
When this was rewritten to only wait for display state changes and not
brightness changes, it forgot to take into account whether a change was
already in flight when reporting whether a change was happening. Fix
that so the display appropriately reports when it's ready and when it's
blocked.

Bug: 32559368
Test: Take systrace of device wakeup, see it actually waits until the
      display is actually ready

Change-Id: Ie3bd5c48d109a0fb2628ccc8f67bb52be51fad5c
2017-06-06 22:08:53 +01:00
Robert Carr
851e7e4394 SurfaceView: Correct inverted alpha detection condition.
Careless mistake on my part :). Sorry about that.

Test: Try an app with two SV like Netflix verify top SurfaceView doesn't occlude bottom one.
Bug: 62375611
Bug: 62113351
Change-Id: Ia33aabf8b8e276f70365d62b82f113ecd3bee2fa
2017-06-06 14:04:50 -07:00
Winson Chung
69a9c170b3 Run explicit GC to clear references to bitmaps earlier.
Bug: 38258699
Test: Open Recents, dump meminfo, close Recents, wait, dump meminfo
Change-Id: Ibdcf94aee4fac9abcde64e30ae1f13cbb551fec0
2017-06-06 14:02:54 -07:00
Todd Kennedy
7e79d354a1 Handle renamed packages during default grants
If a device has a privileged app on the system image which was
updated and a future OTA renames the app package (supported only for
privileged apps) we end up with a disabled system package setting
with no package information. Since we are not doing a null check
of the package we get from the disabled package settings during
default grants we crash leaving the system in a bad state.

Test: Manual
Change-Id: Id7255c92a4a52e368266739cd331977256eee2d3
Fixes: 62376260
2017-06-06 13:54:16 -07:00
Felipe Leme
b372c74e88 Fixed autofill filter comparison.
Test: existing CtsAutoFillServiceTestCases pass
Test: filterTextDifferentPrefixes() pass

Fixes: 62377334

Change-Id: I9edaf500adad7e5775994a838410c3f8f6af2b1a
2017-06-06 13:52:22 -07:00
Felipe Leme
e8f6808079 Use initial value on save when value didn't change.
Otherwise, it will fail to call onSaveRequest() in scenarios where the service
required a field that was pre-populated for the app. For example, when the
service requires both a username and password, the app pre-populates the
username, and the user fills the password.

Test: new LoginActivityTest.testSaveOnlyTwoRequiredFieldsOnePrefilled() pass
Test: existing CtsAutoFillServiceTestCases pass

Bug: 62270740

Change-Id: Idbb11a8c2dab6741c18549c55dfdb71b483c2447
2017-06-06 13:49:42 -07:00
Christopher Tate
e5ef67692e Merge "Fix #62350081 - annotate permission requirements" into oc-dev am: 42abe82bbb
am: 169a884f81

Change-Id: I87140161d20185cd94a6b8b714ae90c5c5b9a773
2017-06-06 20:43:28 +00:00
Jorim Jaggi
20bc608dcc Fix issue with dialer launch transition am: db93133782
am: 1a5f0c7ca8

Change-Id: Id8384736c70d82b9ef95e4cb805dde08f039dc04
2017-06-06 20:41:13 +00:00
Jason Monk
794bcd27ef resolve merge conflicts of be23ef368f to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5364727a21f62fc479c9bca6ad7ab2c3b62d1d1b
2017-06-06 16:38:00 -04:00
Daniel Nishi
62d4642c2c Merge "Change storage manager default to be a config." 2017-06-06 20:37:41 +00:00
TreeHugger Robot
12741cec2d Merge "Implement CacheManager for the Skia pipelines." 2017-06-06 20:37:08 +00:00
Christopher Tate
169a884f81 Merge "Fix #62350081 - annotate permission requirements" into oc-dev
am: 42abe82bbb

Change-Id: I3b8415aac86f9dfd6457e5eca7dce904b1bfef7c
2017-06-06 20:32:55 +00:00
Jorim Jaggi
1a5f0c7ca8 Fix issue with dialer launch transition
am: db93133782

Change-Id: Id1808ca8d1f2547ecb85679c4b7697ee37f69d9f
2017-06-06 20:30:08 +00:00
TreeHugger Robot
ae6455957b Merge "Initial support for proposed android.net.lowpan" 2017-06-06 20:25:54 +00:00