Commit Graph

310866 Commits

Author SHA1 Message Date
Roshan Pius
f817fbce16 Merge "WifiConfiguration: Update psk documentation" am: 89c79ff632 am: 6b6f1b9e12
am: 28212c1b29

Change-Id: I478ebcd9f2d98e35a3ae408d027b67d69de79c09
2017-03-17 17:39:37 +00:00
Roshan Pius
28212c1b29 Merge "WifiConfiguration: Update psk documentation" am: 89c79ff632
am: 6b6f1b9e12

Change-Id: I38ef25c794573c2a0c2817ca4e8cd1a8c2aa9250
2017-03-17 17:33:06 +00:00
Roshan Pius
6b6f1b9e12 Merge "WifiConfiguration: Update psk documentation"
am: 89c79ff632

Change-Id: I3ac1ed89de58038cf7bcddcac7b090fc07a8e4b8
2017-03-17 17:26:57 +00:00
TreeHugger Robot
1c10a61a97 Merge "Allow Instant Apps access PackageInfo of exposed apps" 2017-03-17 17:26:24 +00:00
Treehugger Robot
89c79ff632 Merge "WifiConfiguration: Update psk documentation" 2017-03-17 17:17:50 +00:00
Tomasz Wasilczyk
3d19f90c32 Merge "Add getProgramList call to the broadcast radio API." 2017-03-17 16:34:55 +00:00
Jerome Gaillard
3ce947f482 Merge "Update ColorFilter_Delegate following Change I5f74addd" 2017-03-17 16:29:36 +00:00
TreeHugger Robot
837c927213 Merge "Fix up QS edit UI" 2017-03-17 16:11:36 +00:00
Neil Fuller
ff8b79e162 Merge "Track library change in libcore." am: ed9c176e16 am: 301f1d3645
am: cef08e7482  -s ours

Change-Id: Ide1ba5f3864e13376e15c561a911d5e2394328fa
2017-03-17 15:50:31 +00:00
Neil Fuller
cef08e7482 Merge "Track library change in libcore." am: ed9c176e16
am: 301f1d3645

Change-Id: Ifb24866783cab6a602ac5f3dd1df705ba93d931e
2017-03-17 15:44:05 +00:00
Roshan Pius
cbd0c76ad0 WifiConfiguration: Update psk documentation
Adding some documentation to explain the expected contents of this
field.

Bug: 35967623
Test: make update-api
Change-Id: Ia28e2c79834c4d7b0de7350c18d5f32633e6309d
2017-03-17 08:40:17 -07:00
Andrii Kulian
c1b59ed73e Merge "Separate global and override config sent to client" 2017-03-17 15:39:37 +00:00
Neil Fuller
301f1d3645 Merge "Track library change in libcore."
am: ed9c176e16

Change-Id: Iae6166cf055625947589b3a14b72ed7828738311
2017-03-17 15:38:01 +00:00
TreeHugger Robot
edd694e4bf Merge "Change dependency to standard mockito-target-minus-junit4" 2017-03-17 15:32:07 +00:00
Treehugger Robot
ed9c176e16 Merge "Track library change in libcore." 2017-03-17 15:28:35 +00:00
TreeHugger Robot
a83ebca651 Merge "Protect against hiding while not attached" 2017-03-17 15:27:49 +00:00
liangweikang
5a2c5a3bd9 Merge "[BUG] fix NullPointerException in Notification.java" am: c14d5db093 am: 79e9f380e2
am: 9b0784aa5f

Change-Id: I41f9d2d027138360d3a967c97dbf3aed69512650
2017-03-17 15:07:50 +00:00
liangweikang
9b0784aa5f Merge "[BUG] fix NullPointerException in Notification.java" am: c14d5db093
am: 79e9f380e2

Change-Id: Ic9356edc395f68c5dda5a19a2efca31b5f16a068
2017-03-17 14:57:55 +00:00
liangweikang
79e9f380e2 Merge "[BUG] fix NullPointerException in Notification.java"
am: c14d5db093

Change-Id: Ib1c17e2fe5f36e0230845ca123b0cd2cb7365154
2017-03-17 14:51:58 +00:00
TreeHugger Robot
1d33b07f44 Merge "Removing 'delegate' from constant names" 2017-03-17 14:48:15 +00:00
Treehugger Robot
c14d5db093 Merge "[BUG] fix NullPointerException in Notification.java" 2017-03-17 14:43:20 +00:00
Jason Monk
6f77056666 Fix up QS edit UI
Turns out QS Edit mode didn't like the changes to dual target tiles.
Clean this up a bit.

Test: visual
Change-Id: I158fe8dba6729de102cfc592314ec483a969417d
2017-03-17 10:15:15 -04:00
Paul Duffin
a7773c2fb1 Change dependency to standard mockito-target-minus-junit4
The mockito-updated-target-minus-junit4 target was added because
some tests needed a later version of mockito than was available
through mockito-target-minus-junit4. Since the latter has now
been upgraded to 2.7.13 that is no longer true and so users of
mockito-updated-target-minus-junit4 can be switched to use
mockito-target-minus-junit4 instead.

Bug: 32912773
Test: make checkbuild && runtest systemui
Change-Id: If7e4dd26d7d0e93731856e9739a048c89a835333
2017-03-17 13:52:15 +00:00
Jason Monk
581084123f Protect against hiding while not attached
Change-Id: I44b16d2644c80c737ffc16bf11cc1259e3c3984b
Fixes: 36137783
Test: Edit QS
2017-03-17 09:47:30 -04:00
Julia Reynolds
f619bc5211 Removing 'delegate' from constant names
Change-Id: I2ac4e3ae08f1084da34ea74fdd5177e2d58987af
Fixes: 35812334
Test: build
2017-03-17 08:43:22 -04:00
Jerome Gaillard
5aa62827ca Update ColorFilter_Delegate following Change I5f74addd
Test: layoutlib tests
Change-Id: Ifb18946edb0c40e0120868e211c99a304801e740
2017-03-17 12:15:36 +00:00
Neil Fuller
01a3ff1238 Track library change in libcore.
Adding a required dependency on new shared library for tzdata code.

Bug: 31008728
Test: make
Merged-In: Ia5c3e961ca9f62e27575c8f4d16d562fac2b3461
Change-Id: I40b725a97ae2bc258b1fd4b2312b6c60ff83fe64
2017-03-17 11:57:59 +00:00
Neil Fuller
9408983ba7 Track library change in libcore.
Adding a required dependency on new shared library for tzdata code.

Bug: 31008728
Test: make
Change-Id: Ia5c3e961ca9f62e27575c8f4d16d562fac2b3461
2017-03-17 11:53:05 +00:00
Narayan Kamath
089efe43cf Merge "fd_utils: address a couple of TODOs." am: eae1ae9732 am: a34d01d1ee
am: 8497b653f6

Change-Id: Ic8735187a22df886f07da887f12dddff248d1028
2017-03-17 10:05:14 +00:00
Narayan Kamath
8497b653f6 Merge "fd_utils: address a couple of TODOs." am: eae1ae9732
am: a34d01d1ee

Change-Id: I167e56d78a5a1ef6c2f1bcad891d5f20f4e07375
2017-03-17 09:58:12 +00:00
Narayan Kamath
a34d01d1ee Merge "fd_utils: address a couple of TODOs."
am: eae1ae9732

Change-Id: I8e4e92df3c1f0016de2c396345b7a0b4bc0e1cb6
2017-03-17 09:51:35 +00:00
Narayan Kamath
eae1ae9732 Merge "fd_utils: address a couple of TODOs." 2017-03-17 09:44:12 +00:00
Narayan Kamath
3879ecc891 fd_utils: address a couple of TODOs.
Drink the android::base koolaid.

Test: make, boots
Change-Id: Ib24b9b59fa3490e80ba78be0199eafa676225b73
2017-03-17 09:43:53 +00:00
TreeHugger Robot
4bb2ccca8d Merge "Fixed cancel() and commit():" 2017-03-17 08:16:04 +00:00
TreeHugger Robot
b096e58811 Merge "Sets accessibility title for autofill dataset picker." 2017-03-17 06:43:05 +00:00
Jakub Pawlowski
7800604d0d Merge "LE Maximum Advertising Data Length (1/4)" am: 74f2e1a303 am: 2fc3834f4d
am: 066e8551f1

Change-Id: If9ee85705e7c47820e23ad79a048e4c04c4cc11a
2017-03-17 05:31:07 +00:00
Jakub Pawlowski
066e8551f1 Merge "LE Maximum Advertising Data Length (1/4)" am: 74f2e1a303
am: 2fc3834f4d

Change-Id: Iad555280f5d702c63c76a2399c8d02ac39749a77
2017-03-17 05:26:26 +00:00
Jakub Pawlowski
2fc3834f4d Merge "LE Maximum Advertising Data Length (1/4)"
am: 74f2e1a303

Change-Id: I3b6599937ddd04a9c13573d156cc721152c0005a
2017-03-17 05:19:57 +00:00
Jakub Pawlowski
74f2e1a303 Merge "LE Maximum Advertising Data Length (1/4)" 2017-03-17 05:13:45 +00:00
TreeHugger Robot
9d755c046a Merge "Added a new AutofillCallback.EVENT_INPUT_UNAVAILABLE event." 2017-03-17 04:09:57 +00:00
TreeHugger Robot
77724a5be7 Merge "WifiConfiguration: Correct documentation for priority" 2017-03-17 04:06:52 +00:00
Roshan Pius
60d9c84209 Merge "WifiConfiguration: Update psk documentation" 2017-03-17 03:59:40 +00:00
Joel Scherpelz
5e1eb40c8f Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces" am: 52f8421b77 am: b8933942fc
am: f9cd5cd81b

Change-Id: I5ebbe1a63da43f28b0d582bc7e6480ffe74195b7
2017-03-17 03:05:45 +00:00
liangweikang
63b03b573f [BUG] fix NullPointerException in Notification.java
https://code.google.com/p/android/issues/detail?id=252835

Test: null

Change-Id: I6c575686c75b02ac938f35622b522fff25403c29
Signed-off-by: liangweikang <liangweikang900911@gmail.com>
2017-03-17 02:59:49 +00:00
Joel Scherpelz
f9cd5cd81b Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces" am: 52f8421b77
am: b8933942fc

Change-Id: Ic1b6226da3cfb68eeb352c1f81df09733ab52e4d
2017-03-17 02:59:11 +00:00
Joel Scherpelz
b8933942fc Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
am: 52f8421b77

Change-Id: I5b5d5460f9fe7ed228ab32b2c63cb601be5e1edb
2017-03-17 02:53:11 +00:00
Felipe Leme
6d0cb1e8eb Fixed cancel() and commit():
- Call removeSelfLocked() on cancelSessionLocked.
- Call removeSelf() after dispatching the PendingSaveRequest.
- Added a finalizer callback to PendingSaveRequest that calls removeSelf().
- Fixed SaveUi SnackBar so its actions are only triggered once.
- Reused removeSelfLocked() when needed.
- Removed unnecessary {} on some lambdas.
- Removed unnecessary mLock on PendingSaveRequest.
- Removed unnecessary mLock usage on PendingFillRequest.

Test: CtsAutoFillServiceTestCases (including new tests) pass
Test: manual verification

Fixes: 35721501
Fixes: 35844249

Change-Id: I9789218777b62a9558a602b8eaed0714d8b77fa0
2017-03-16 19:51:59 -07:00
Treehugger Robot
52f8421b77 Merge "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces" 2017-03-17 02:44:07 +00:00
Felipe Leme
24aae15218 Added a new AutofillCallback.EVENT_INPUT_UNAVAILABLE event.
This event is called when:

- After notifyViewEntered() when autofill is disabled.
- After service returns an "empty" FillResponse to FillCallback.onSuccess().

BUG: 36056207

Test: LoginActivityTest.testAutofillCallbackDisabled
Test: LoginActivityTest.testAutofillCallbackNoDatasets
Test: VirtualContainerActivityTest.testAutofillCallbackDisabled
Test: VirtualContainerActivityTest.testAutofillCallbackNoDatasets

Change-Id: I7b8636473f738bf600aa96b28c77827b2cc78815
2017-03-16 19:40:22 -07:00
Karthik Ravi Shankar
e6ccc3e816 Merge "Add API to get compatibility display id" 2017-03-17 02:34:07 +00:00