Chris Tate
21810b1dbf
Merge "Always store wallpaper metadata to backup" into nyc-mr1-dev
...
am: e6fe1287c9
2016-09-20 20:34:10 +00:00
Christopher Tate
3211545509
Always store wallpaper metadata to backup
...
am: a611fdc66b
2016-09-20 20:34:07 +00:00
smain@google.com
e609ec63f0
resolve merge conflicts of 491bc2b to nyc-dr1-dev
...
am: 45bf970ebc
2016-09-20 20:33:57 +00:00
Jason Monk
d3dd5bd672
Fix data disabled icons in RTL am: a138395cc8
...
am: 200e9e5a2b
2016-09-20 20:33:46 +00:00
Scott Main
1c944335cb
Merge changes from topic 'n-versioncode' into nyc-dev
...
am: 99ec81ab46
2016-09-20 20:33:06 +00:00
TreeHugger Robot
1ec6ccdafc
Merge "Protect against crash on user switch" into nyc-mr1-dev
2016-09-20 20:33:05 +00:00
Dianne Hackborn
c8bf8951c2
A little more on issue #30766518 : Document what targeting N does
...
am: da6be5b871
2016-09-20 20:33:01 +00:00
Treehugger Robot
eda7bc5c84
Merge "Removed legacy code used to read/write java arrays from HwBinder parcels."
2016-09-20 20:28:12 +00:00
TreeHugger Robot
0ef6986379
Merge "For pre-N apps, keep entered all parents of an drag-entered child." into nyc-mr1-dev
2016-09-20 20:27:25 +00:00
Scott Main
a1c28fa8d8
Merge "update metadata for the studio landing page cards (for 2.2 content) edit landing page banner ("a dozen" --> "20")" into nyc-dev
2016-09-20 20:26:12 +00:00
Jason Monk
70fc5b1bf4
Merge "Fix data disabled icons in RTL" into nyc-mr1-dev
...
am: e4a53a3677
2016-09-20 20:19:32 +00:00
Jason Monk
200e9e5a2b
Fix data disabled icons in RTL
...
am: a138395cc8
2016-09-20 20:19:29 +00:00
Chris Tate
e6fe1287c9
Merge "Always store wallpaper metadata to backup" into nyc-mr1-dev
2016-09-20 20:08:15 +00:00
TreeHugger Robot
e4a53a3677
Merge "Fix data disabled icons in RTL" into nyc-mr1-dev
2016-09-20 20:04:09 +00:00
Fan Zhang
51365c3b4c
Fix NPE for WifiConfiguration in AccessPoint.
...
In getSummary methods, make a local reference to WifiConfig before
accessing the fields to prevent member variable mConfig being reset in a
different thread.
Bug: 31617798
Test: manually open/close/refresh wifi settings and see no crash.
Change-Id: I254cb3cb59dead425a9ada17d9e84a7e2974f738
2016-09-20 19:31:27 +00:00
Jason Monk
6e6af2c7ee
Protect against crash on user switch
...
Somehow one of the tiles doesn't have a view yet. Assume that this
is a transient part of the tiles getting recreated and that the skipped
tile will get picked up in the next layout.
Change-Id: Ia1370d66119bfcfa7b00bd087bcb0d72a072666a
Fixes: 31394359
2016-09-20 14:53:28 -04:00
Doris Ling
9140db194f
Merge "Add secure settings for Ambient Display pick up and double tap gestures." into nyc-mr1-dev am: b4b96040e0
...
am: 5452f047a8
2016-09-20 18:48:20 +00:00
Doris Ling
4c25818533
Add secure settings for Ambient Display pick up and double tap gestures. am: 6403b4050f
...
am: 6591ac6381
2016-09-20 18:46:19 +00:00
smain@google.com
0e98b64adf
update metadata for the studio landing page cards (for 2.2 content)
...
edit landing page banner ("a dozen" --> "20")
Change-Id: Iccad4faab12930eac9fe58b5c84ba08d444fbee6
2016-09-20 18:41:56 +00:00
Doris Ling
5452f047a8
Merge "Add secure settings for Ambient Display pick up and double tap gestures." into nyc-mr1-dev
...
am: b4b96040e0
2016-09-20 18:41:05 +00:00
Doris Ling
6591ac6381
Add secure settings for Ambient Display pick up and double tap gestures.
...
am: 6403b4050f
2016-09-20 18:41:03 +00:00
smain@google.com
45bf970ebc
resolve merge conflicts of 491bc2b to nyc-dr1-dev
...
Change-Id: Ice6c0ba347e0dc0d01b425faec0db37a2d65b8a2
2016-09-20 11:40:07 -07:00
Doris Ling
b4b96040e0
Merge "Add secure settings for Ambient Display pick up and double tap gestures." into nyc-mr1-dev
2016-09-20 18:26:47 +00:00
Mary Yanchar
140c793b0c
Merge "Small change for new sample test code" into nyc-dev
...
am: e5e9265e09
2016-09-20 18:26:32 +00:00
Mary Yanchar
be34171986
Small change for new sample test code
...
am: acb3eb39da
2016-09-20 18:26:27 +00:00
Jason Monk
a138395cc8
Fix data disabled icons in RTL
...
Change-Id: Idfde6cbb3f1e19c44f33fda98c8c94d795a7763b
Fixes: 30130440
2016-09-20 14:21:19 -04:00
Mary Yanchar
e5e9265e09
Merge "Small change for new sample test code" into nyc-dev
2016-09-20 18:19:24 +00:00
Jordan Liu
8594e87005
Remove configs in frameworks/base
...
Remove old configs within frameworks/base. With move to CarrierConfig no
need for the old config_cdma_3waycall_flash_delay resources.
Note that the new carrier_config files replace all values with 300
instead of leaving some as 70 and some as 300. The configs that set the
value to 70 were to fix http://b/17331584 , and the configs that set the
value to 300 fixed http://b/24638158 . It seems like as long as the value
is above 70ms both bugs should stay resolved.
Merged-In: I15d54e09a4b474b1f83a05cbe777c826cdef368f
Bug: 29873049
Change-Id: I15d54e09a4b474b1f83a05cbe777c826cdef368f
2016-09-20 11:19:11 -07:00
Yohei Yukawa
b63da2512d
Merge "Fix another deadlock between IMMS and TSMS" into nyc-mr1-dev am: 786cec2f00
...
am: f930d420d1
2016-09-20 18:10:51 +00:00
Jordan Liu
bd3f2a7eb0
Add cdma_3waycall_flash_delay key to CarrierConfig
...
Add KEY_CDMA_3WAYCALL_FLASH_DELAY_INT and default value to
CarrierConfigManager, and remove the references to the old config in
core/res/res/values/[config.xml/symbols.xml]
Merged-In: I53dc93defbfa7d1366e6ee066638d73df03f88d0
Bug: 29873049
Change-Id: I53dc93defbfa7d1366e6ee066638d73df03f88d0
2016-09-20 11:10:39 -07:00
Yohei Yukawa
a833b63e8b
Fix another deadlock between IMMS and TSMS am: e3e31a8801
...
am: 7fa2d8cfed
2016-09-20 18:08:27 +00:00
Yohei Yukawa
f930d420d1
Merge "Fix another deadlock between IMMS and TSMS" into nyc-mr1-dev
...
am: 786cec2f00
2016-09-20 18:00:08 +00:00
Yohei Yukawa
7fa2d8cfed
Fix another deadlock between IMMS and TSMS
...
am: e3e31a8801
2016-09-20 18:00:05 +00:00
Amit Mahajan
71e9ea6770
Added new config to indicate uneditable APN fields.
...
Bug: 30457714
Change-Id: I2e089f16a7f4e77b8f0bdd10e0c63bbc4a3a11a1
2016-09-20 10:58:57 -07:00
Yohei Yukawa
786cec2f00
Merge "Fix another deadlock between IMMS and TSMS" into nyc-mr1-dev
2016-09-20 17:53:29 +00:00
Lorenzo Colitti
7751e1a2f1
Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev am: 59266eec4e am: 7b68411de0
...
am: 518969b8cc
2016-09-20 17:42:12 +00:00
Lorenzo Colitti
bee190ee38
Add debug output for bad wifi avoidance restrictions. am: 29bd384f2c am: cac09035f2
...
am: 86bd4caed2
2016-09-20 17:40:14 +00:00
Lorenzo Colitti
3f67cbec46
Support "don't ask again" in the avoid bad wifi dialog. am: 165c51c0eb am: aab02df195
...
am: 63275aba54
2016-09-20 17:39:19 +00:00
Greg Hackmann
d7151c06f1
AlarmManagerService: remove legacy /dev/alarm support
...
We've removed the Android alarm driver from our supported kernels. It's
time to remove the userspace callers too: they make the native side of
AlarmManagerService more complex, and send the wrong signal about
/dev/alarm still being supported.
Bug: 28357356
Test: cts-tradefed run singleCommand cts -d -c android.app.cts.AlarmManagerTest
Change-Id: I619e2d8a98e4c4728131a2d826b1295f858abedd
Signed-off-by: Greg Hackmann <ghackmann@google.com >
2016-09-20 10:35:40 -07:00
Lorenzo Colitti
518969b8cc
Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev am: 59266eec4e
...
am: 7b68411de0
2016-09-20 17:26:49 +00:00
Lorenzo Colitti
86bd4caed2
Add debug output for bad wifi avoidance restrictions. am: 29bd384f2c
...
am: cac09035f2
2016-09-20 17:25:19 +00:00
Lorenzo Colitti
63275aba54
Support "don't ask again" in the avoid bad wifi dialog. am: 165c51c0eb
...
am: aab02df195
2016-09-20 17:22:51 +00:00
Lorenzo Colitti
7b68411de0
Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev
...
am: 59266eec4e
2016-09-20 17:16:19 +00:00
Lorenzo Colitti
cac09035f2
Add debug output for bad wifi avoidance restrictions.
...
am: 29bd384f2c
2016-09-20 17:15:50 +00:00
Lorenzo Colitti
aab02df195
Support "don't ask again" in the avoid bad wifi dialog.
...
am: 165c51c0eb
2016-09-20 17:14:50 +00:00
Etan Cohen
b7f1a665b5
Merge "[NAN] Rename to make discovery explicit" am: 5706a8f535 am: eb4c838c46
...
am: ad864c8fd9
2016-09-20 17:07:31 +00:00
Scott Main
9340130a5e
Merge changes from topic 'n-versioncode' into nyc-dev
...
am: 99ec81ab46
2016-09-20 17:07:22 +00:00
Dianne Hackborn
3da7e4e563
A little more on issue #30766518 : Document what targeting N does
...
am: da6be5b871
2016-09-20 17:07:15 +00:00
Dianne Hackborn
bae14052a0
Cherrypick so we can publish N version code description ASAP
...
am: 491bc2b8d6
2016-09-20 17:05:09 +00:00
Lorenzo Colitti
59266eec4e
Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev
...
* changes:
Add debug output for bad wifi avoidance restrictions.
Support "don't ask again" in the avoid bad wifi dialog.
2016-09-20 17:04:40 +00:00
