311926 Commits

Author SHA1 Message Date
Jack Yu
e0f9f9f8ee Merge "Deprecated getDeviceId and added getMeid and getImei" 2017-03-24 02:09:49 +00:00
Amin Shaikh
e50a607a35 Update hidden WifiManager API.
- Refactor getWpsNfcConfigurationToken(int) to getCurrentNetworkWpsNfcConfigurationToken()

Bug: 35725168
Test: runtest frameworks-wifi
Change-Id: Ia362e4d781297d7f89a4437a0c5ae6edecff24e5
2017-03-23 18:50:01 -07:00
TreeHugger Robot
0e74c95c0c Merge "Unhide FLAG_SUPPORT_EJECT and related methods." 2017-03-24 01:23:53 +00:00
Suprabh Shukla
0693ff6d0e Removing unused method indexOfValueByValue
The method was confusing and not used by anyone. Same functionality can
be implemented trivially in the client code.

Test: N/A

Bug: 35765468
Change-Id: Ia019088cd023c62d83760d9ebe883f7559a43375
2017-03-24 01:22:05 +00:00
Colin Cross
2b6aa352e5 Remove framework-protos from SystemUI
SystemUI builds against the framework, it doesn't need to have its
own copy of framework-protos.

Test: m -j ANDROID_COMPILE_WITH_JACK=false checkbuild
Change-Id: Ia971b2bc648558283562c7080b4d683a7e45fb60
2017-03-23 18:08:41 -07:00
Colin Cross
6a8a4d8912 Disable proguard for PluginDummyLib
Proguard fails for jars that contain no class files, disable it.

Test: m -j ANDROID_COMPILE_WITH_JACK=false PluginDummyLib
Change-Id: I0001eb3de7b7cea2fa9f91de0c1e59569d41ae8a
2017-03-23 18:08:41 -07:00
Colin Cross
770324964a Enable multidex for dx
Enable multidex for dx where it is already enabled for jack.

Test: m -j ANDROID_COMPILE_WITH_JACK=false FrameworksServicesTests
Change-Id: I55a6951ef471930e7737d9f93aaaffb567d4a580
2017-03-23 18:08:41 -07:00
TreeHugger Robot
79eca112eb Merge "Recents: Remove TV Specific blacklist" 2017-03-24 00:48:25 +00:00
TreeHugger Robot
1debeab7ff Merge "Add logging constant for vr display preference" 2017-03-24 00:47:42 +00:00
TreeHugger Robot
99ce58fb08 Merge "Fix add user tint, some people thought it was disabled" 2017-03-24 00:45:51 +00:00
Jaewan Kim
92477b88c4 Merge "PIP: Move TV PIP location to the bottom right" 2017-03-24 00:44:07 +00:00
Amith Yamasani
3945202dc8 Some logging for settings reset
If settings db gets reset because it disappeared/got corrupted,
then write the Build.ID of the OTA, so we know when it was reset.

Bug: 36365648
Test: manual
Change-Id: I499a7f65f07a61c0e4651dbd046fc5b16408c09d
2017-03-23 17:43:39 -07:00
Jason Monk
782cd6711b Create plugin interface for volume dialog
Very few logic changes, mostly just breaking out certain interfaces
and classes to the plugin lib.

Test: make + volume keys
Change-Id: Ieabc6d35f6ef980842849236a0b8ffd5543b3a2c
2017-03-24 00:40:25 +00:00
Daichi Hirono
e56740dc08 Use a single thread to handle multiple AppFuse mounts.
Previously StorageManagerService launched a thread per AppFuse mount
point. The CL changes the behavior so that it just launches a single
thread to handle multiple AppFuse mounts.

Bug: 34903085
Test: CTS and manually testing
Change-Id: I2d9e7232834b0c8eff633b85110a3b38534171f7
2017-03-24 09:36:48 +09:00
Jason Monk
287eb95e68 Merge "Less cereal, more stable" 2017-03-24 00:35:28 +00:00
George Mount
838166d3e6 Do not reuse fragment indices.
Bug 25472591

Use a SparseArray instead of two ArrayLists to track
active fragments. This allows monotonically increasing
indexes instead of reusing indexes in the ArrayList.

Test: ran cts tests

Change-Id: I98f1b7928a0ef2373b719b76582a4c6da3425817
2017-03-23 17:28:52 -07:00
The Android Automerger
c5f93a9eb6 Merge commit '745766e11e8bb7e8642be33be6bdf501af245074' into HEAD
* commit '745766e11e8bb7e8642be33be6bdf501af245074':
  Forward package removed broadcast to KeyChainService
2017-03-23 23:51:20 +00:00
Matthew Ng
8e265527f9 Unminimizing after toggle screen on/off shows docked app correctly (1/2)
When turning screen off when in minimized mode with resizable launcher,
then turning screen back on and unminimizing, it would have the
incorrect position of the divider from the started split position and
the docked app would have the wrong task bounds compared to its stack
bounds (so the docked app looks clipped). Block toggling minimized state
when screen turns off when being minimized will fix this.

Fixes: 34937502, 35388501
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
CtsServicesHostTestCases
android.server.cts.ActivityManagerDockedStackTests
Change-Id: I255a56d6b4041586f9125ee39f6e75a3c61f544f
2017-03-23 16:42:42 -07:00
Garfield Tan
8787703ae0 Unhide FLAG_SUPPORT_EJECT and related methods.
Test: Builds and CTS tests pass. Some manual tests as well.
Bug: 36483910
Change-Id: Idd9b1c9d9573222ee12127044ff11b9ab2487f0a
2017-03-23 16:41:24 -07:00
Julius D'souza
948e2bfd3f Merge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps." into cw-f-dev am: e07e8ac99a -s ours am: 610663ebc5
am: fa64e10e2e  -s ours

Change-Id: If3acbdf6326f37aa78a2ec530e772959f046c514
2017-03-23 23:37:31 +00:00
Dmitri Plotnikov
7ded2670fc Adding TV-specific strings
Bug: 36175844
Test: generate a bugreport and check the notification description
Change-Id: I0030d51e566cc2d68b4c87a9e7d7cbb0d5a21ac1
2017-03-23 16:33:55 -07:00
Julius D'souza
fa64e10e2e Merge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps." into cw-f-dev am: e07e8ac99a -s ours
am: 610663ebc5

Change-Id: If3eb5d3b12f4780177aef37e4133338b0d8eb8d2
2017-03-23 23:32:40 +00:00
Julius D'souza
610663ebc5 Merge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps." into cw-f-dev
am: e07e8ac99a  -s ours

Change-Id: I65724f0fa8bb9763484f2766c061310d6da06918
2017-03-23 23:27:56 +00:00
TreeHugger Robot
55807c973b Merge "Anchor a cascading submenu to its parent menu item" 2017-03-23 23:25:41 +00:00
Sid Soundararajan
a28edc9463 Recents: Remove TV Specific blacklist
Test: Pre-submit tests should pass.

BUG: 36566671

Change-Id: I39bee60bc61b501c57b3c304f86cee7fb9c0560b
2017-03-23 16:21:59 -07:00
Julius D'souza
e07e8ac99a Merge "DO NOT MERGE: Add state machine model for skipping initial brightness ramps." into cw-f-dev 2017-03-23 23:15:47 +00:00
Peter Qiu
424c8c1716 Merge "Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" am: 44ef19d131 am: aadbb2d45e" into nyc-mr2-dev-plus-aosp
am: 3f57a273d2

Change-Id: Ie314289ce69f07c872c7a16ddc90d36be25c777f
2017-03-23 23:13:32 +00:00
Wei Wang
0a247732a5 Merge "Remove bg_non_interactive cgroup [ DO NOT MERGE ]" into nyc-mr2-dev am: 7e6dea0fab
am: 2e413a8ccf  -s ours

Change-Id: Icdcbd84f8af10ee177e1e1eb3c9210a8c3e4f79c
2017-03-23 23:08:58 +00:00
Android Build Merger (Role)
3f57a273d2 Merge "Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" am: 44ef19d131 am: aadbb2d45e" into nyc-mr2-dev-plus-aosp 2017-03-23 23:06:27 +00:00
Peter Qiu
da81963e3c Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" am: 44ef19d131
am: aadbb2d45e

Change-Id: Ica6e22e24e421cafa50f1c9b9a2483f37459e9d8
2017-03-23 23:05:29 +00:00
Wei Wang
2e413a8ccf Merge "Remove bg_non_interactive cgroup [ DO NOT MERGE ]" into nyc-mr2-dev
am: 7e6dea0fab

Change-Id: Ife3062eddc884dfffccaf7a85ce72dfb5d944882
2017-03-23 23:02:15 +00:00
TreeHugger Robot
f2c4c0a08b Merge "Fixes attestation id gathering from secondary android user" 2017-03-23 23:00:25 +00:00
Peter Qiu
aadbb2d45e Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data"
am: 44ef19d131

Change-Id: I65b22e41ae62172cc7b241fe68c6d1c92c782a69
2017-03-23 23:00:06 +00:00
Amit Pawar
bfe08f7b33 Merge "Ignore notifications with zero-timing vibrations." 2017-03-23 22:53:49 +00:00
Treehugger Robot
44ef19d131 Merge "wifi: use android.graphics.drawable.Icon for Passpoint icon data" 2017-03-23 22:53:46 +00:00
Jason Monk
ed507a3f10 Don't inflate LegacyGlobalActions until its shown
It has some buggy code that depends on it being shown directly
after being instantiated, so make sure we don't instantiate it
until we need it.

Test: See bug, its complicated
Change-Id: Ic4863f53abaeb2d2070258a7f65b214376fb2889
Fixes: 36556777
2017-03-23 18:39:19 -04:00
Robin Lee
745766e11e Merge commit 'bd10777948fe5a0d9452f73c30941f46c6b4a2bf' into HEAD
* commit 'bd10777948fe5a0d9452f73c30941f46c6b4a2bf':
  Forward package removed broadcast to KeyChainService

Test: make full -j30
Fix: 36568026
Change-Id: Icd3cda64e403212132e2c7d731e9793eb92c368a
2017-03-23 22:37:02 +00:00
TreeHugger Robot
350948e9d7 Merge "Hide Parcel#readSparseIntArray and Parcel#writeSparseIntArray" 2017-03-23 22:36:59 +00:00
TreeHugger Robot
790be32525 Merge "Verify paging is by auto-pager in CTS." 2017-03-23 22:36:02 +00:00
Chris Thornton
d7a7af558b Prevent inclusion of null KeyphraseMetadata in info map.
If getKeyphraseMetadataFromApplicationInfo encountered a parse error, it
would return a null KeyphraseMetadata instance. Other parts of
KeyphraseEnrollmentInfo assume that everything inserted into the member
mKeyphrasePackageMap is valid, so this would cause an NPE.

Bug:33448806
Test: Build a bogus enrollment APK and not see a crash.
Change-Id: I0936439ea4bd0050580a7b0ee8f08f2992ebfd63
2017-03-23 15:32:59 -07:00
Conrad Chen
ca47020270 Merge "TIF: Make COLUMN_LOCKED of channels table public" 2017-03-23 22:31:09 +00:00
Geoffrey Pitsch
b3ba20fe52 Merge "Disable no-channel exception, notifications will silently fail" 2017-03-23 22:23:06 +00:00
TreeHugger Robot
f5604e101b Merge "Notification Inline strings for non-upgraded apps" 2017-03-23 22:19:40 +00:00
TreeHugger Robot
f26f5c7e66 Merge "Introduce AuthenticationRequiredException, and @hide RecoverableSecurityException." 2017-03-23 22:12:27 +00:00
Matt Sarett
7f60d4a894 Merge "Support Alpha8->RGBA bitmap copying" 2017-03-23 22:05:14 +00:00
Geoffrey Pitsch
96cac7f722 Disable no-channel exception, notifications will silently fail
Logs instead in the meantime.

Bug: 36516812
Test: runtest systemui-notification
Change-Id: I03dd46b7357e443c7810cecda9a8ba13c9755f30
2017-03-23 17:57:12 -04:00
Geoffrey Pitsch
df95d9c769 Merge "Add null check on serviceinfo" 2017-03-23 21:54:30 +00:00
TreeHugger Robot
0fd90c00c9 Merge "Ignore flaky notification test" 2017-03-23 21:49:06 +00:00
Fan Zhang
ed1845fdcc Add logging constant for vr display preference
Change-Id: I46f4add85162a4242adb5b3ff519c21129ef917e
Fix: 36557316
Test: builds
2017-03-23 14:46:59 -07:00
Brad Ebinger
ead72f2c60 Merge "Notification for MM reject cause code" am: 0805b3486f -s ours am: 2aee612c14 -s ours
am: a0668b3042  -s ours

Change-Id: Ia085ff3ec92af263047f0d8ae1eaffabb103431d
2017-03-23 21:44:10 +00:00