Commit Graph

62299 Commits

Author SHA1 Message Date
Raph Levien
6cfecf4dff Merge "Apply correct bottom padding to layouts" into nyc-dev 2016-04-06 15:52:56 +00:00
Julia Reynolds
fa305fcc6b Merge "Documentation update for interruption filters." into nyc-dev 2016-04-06 15:34:09 +00:00
Yohei Yukawa
12a52bc391 Merge "Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling." into nyc-dev 2016-04-06 15:06:57 +00:00
Julia Reynolds
dd0605b052 Documentation update for interruption filters.
Bug: 27901142
Change-Id: I977f7dc4010dc826e06dfb01ad6db68380b80fde
2016-04-06 10:33:14 -04:00
Benjamin Franz
4a53c8e702 Merge "Document which APIs are callable on the parent instance" into nyc-dev 2016-04-06 12:17:26 +00:00
Benjamin Franz
66b45f01ff Document which APIs are callable on the parent instance
In DPM it is possible to retrieve a parent instance to set policies
that are applied to the profile parent. Extend the javadoc to clarify
which APIs are actually callable on the parent instance.

Bug: 27532279
Change-Id: I7ed40f8c3c7c3089283489bff41a04c70239d5a4
2016-04-06 11:59:49 +01:00
Erik Kline
36712853a9 Merge "Make public the registerDefaultNetworkCallback API" into nyc-dev 2016-04-06 08:51:08 +00:00
Yohei Yukawa
2dbc532429 Fix a regression in SHOW_IME_WITH_HARD_KEYBOARD handling.
This is a follow up CL to my previous CL [1], which caused a regression
that LatinIME does not correctly initialize its UI when:
  1. Make sure SHOW_IME_WITH_HARD_KEYBOARD is off.
  2. Pair a hardware keyboard.
  3. Reboot.
  4. Make sure the hardware keyboard is paird.
  5. Focus in a text box.
  6. Make sure that LatinIME does not show software keyboard.
  7. Tap the IME switcher and turn of "Show Input Method" toggle.

Previously IMS had called many methods from
IMS#onConfigurationChanged(), which was just replaced with
IMS#restartInput() by my CL [1] then broke some assumptions in LatinIME.
This could also break other IMEs' assumptions as well.

To avoid unexpected regressions between M and N like this, this CL
ensures that those methods are called as we have done until [1].

 [1]: Id4d332e3909590c68345e10e1f2e18650efb2eb7
      7b739a802c

Bug: 26985193
Change-Id: Iebd98f26d388b64cb318ac202b3bcdd956bd3a27
2016-04-06 05:47:14 +00:00
Erik Kline
f46600d074 Make public the registerDefaultNetworkCallback API
Change-Id: I89d7a6f49f5d6a0da3402a07407b0f8d93181b4f
2016-04-06 12:22:47 +09:00
Erik Kline
94887874e3 Don't flush DNS cache on route changes.
Since Lollipop, routes are isolated within Networks.  Flushing a
Network's DNS cache whenever that same Network's routes are updated
doesn't provide any benefit.  Any system components depending on this
behaviour need to uncovered and fixed.

Additionally, clean up no-longer-used flushNetworkDnsCache().  This
should be replaced, when needed, by a proper binder interface to netd.

Change-Id: I34bf79e4839da014d466058a876d754209d0c007
2016-04-06 11:30:51 +09:00
Erik Kline
49e2db1b10 Merge "Delete unused DnsPinger" into nyc-dev 2016-04-06 02:07:02 +00:00
Svetoslav Ganov
f13f14ef30 Merge "Remove unusable a11y APIs for ClickableSpans." into nyc-dev 2016-04-06 02:05:42 +00:00
Eino-Ville Talvala
255490c33c Merge "Camera: Null check remote binder interface" into nyc-dev 2016-04-06 01:19:13 +00:00
Eino-Ville Talvala
0305624f3d Camera: Null check remote binder interface
For LEGACY mode, there's no remote binder, so need to null check for
that case.

Bug: 28000512
Change-Id: I31035f16fd32875d0bd84ca801927498e86133b3
2016-04-05 18:12:11 -07:00
Makoto Onuki
ca94f29366 Merge "Make FastXmlSerializer more suitable to persist arbitrary strings" into nyc-dev 2016-04-06 00:36:52 +00:00
Joe Onorato
9b87cc2b8b Merge "Add stack traces to logs about mismatched sequenece numbers in procstats." into nyc-dev 2016-04-06 00:21:56 +00:00
Makoto Onuki
3ae3557ea3 Make FastXmlSerializer more suitable to persist arbitrary strings
- Encode '\u000' - '\u001F', so KXmlParser can read them properly.
Otherwise KXmlParser will ignore CRs/LFs in attributes, and CRs
in text.

- Originally FastXmlSerializer would throw if a string contains
dangling surrogate pairs.  Now we REPLACE them with.

Bug 27792649

Change-Id: I10c547dad2475b68f60e9e8208d9a3eae8e20063
2016-04-05 16:12:07 -07:00
Eino-Ville Talvala
2a6f476836 Merge "Camera2: Unlink camera device death listener on disconnect" into nyc-dev 2016-04-05 23:07:43 +00:00
Jeremy Joslin
b770ed1328 Merge "Have the NetworkScoreService bind to the scorer." into nyc-dev 2016-04-05 22:27:11 +00:00
Chris Tate
71f4e14402 Merge "API feedback: clarify onQuotaExceeded() documentation" into nyc-dev 2016-04-05 21:51:20 +00:00
Kirill Grouchnikov
12454dcab1 Merge "Return correct unfocused month date color for pre-Material themes." into nyc-dev 2016-04-05 21:48:32 +00:00
Kirill Grouchnikov
7cf1586ce4 Return correct unfocused month date color for pre-Material themes.
Also deprecate setter / getter for showWeekNumber field.

Bug: 28022795
Change-Id: Ie0c33353f76c2a3d9666959a07f6809b7b85183f
2016-04-05 17:42:34 -04:00
Yohei Yukawa
1bc62ce846 Merge "Don't give IME focus to temporarily detached View." into nyc-dev 2016-04-05 21:21:09 +00:00
Ajay Panicker
b6e1dafe78 Allow factory reset when bluetooth is off (1/2)
Bug: 27348444
Change-Id: I6c2709371b86581709649d7faf09391230449b9b
2016-04-05 20:23:21 +00:00
Sunny Goyal
60c74e836f Merge "Changing startListening to only fetch views which are bound" into nyc-dev 2016-04-05 18:53:18 +00:00
Chris Craik
cd6ea77d07 Merge "Fix software layer alpha" into nyc-dev 2016-04-05 18:50:26 +00:00
George Mount
dc63f7c624 Merge "Restore fragment transaction animation state information." into nyc-dev 2016-04-05 17:27:34 +00:00
Oleksiy Vyalov
81c9ea4034 Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev 2016-04-05 17:27:24 +00:00
Yohei Yukawa
e470fcfeb0 Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev 2016-04-05 17:22:47 +00:00
Chris Craik
cfa6dade73 Fix software layer alpha
Fixes: 27429404

Software layers must combine layerpaint alpha, if present, with view
alpha.

Change-Id: If9c7dcb53ab8754b4e123cf9cc332a566fd792c4
2016-04-05 10:15:11 -07:00
Dianne Hackborn
4345904050 Merge "(Docs only) Make battery stats process state docs more clear." into nyc-dev 2016-04-05 16:54:55 +00:00
Dianne Hackborn
a0200e3702 (Docs only) Make battery stats process state docs more clear.
Change-Id: I7e86705ec5fa7be8d6a74e708bbf166bec17494f
2016-04-05 09:54:02 -07:00
Alan Viverette
9d8ec0f12e Merge "Rewrite popup window positioning algorithm" into nyc-dev 2016-04-05 16:29:08 +00:00
Glenn Kasten
5cb05f810b Merge "Fix typo" into nyc-dev 2016-04-05 15:00:22 +00:00
Kirill Grouchnikov
bbcf4327d2 Merge "Add a hidden test-only API to get Toolbar's navigation view." into nyc-dev 2016-04-05 14:54:48 +00:00
Rubin Xu
63d1ee45ee Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev 2016-04-05 14:52:02 +00:00
Oleksiy Vyalov
b68bcbdfe7 Send nativeDebuggable byte value as part of HELLO response.
Bug: 27942453

Change-Id: I4a222c88e104040b08e603e300e54a1ca2c038fe
2016-04-05 07:25:18 -07:00
Alan Viverette
16aaa3e535 Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev 2016-04-05 14:15:10 +00:00
Jason Monk
b65b7105cd Revert "Add Preference#onDetachedFromActivity"
This reverts commit e18dc50c63.
Fixes: 27807793

Change-Id: Ib0384e3deb8d6376265e8e60f14490de128c9b68
(cherry picked from commit eff3ca5480)
2016-04-05 14:06:47 +00:00
Robin Lee
691b1a6005 Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 2016-04-05 14:04:40 +00:00
Lorenzo Colitti
19e84f7b75 Merge changes Ibb63f6b4,Ib64559a5 into nyc-dev
* changes:
  Clean up netd state when tethering fails.
  Clear LinkProperties on interface removed.
2016-04-05 13:35:09 +00:00
Lorenzo Colitti
a3d5948c37 Clear LinkProperties on interface removed.
When an interface is removed, all netlink events for that
interface are lost, because netd will no longer be able to
resolve the ifindex in the netlink event to an interface name,
and it only communicates to the framework events that include an
interface name.

This can cause us to end up with stale IP addresses if, for
example, wlan0 is removed because we switch wifi back from AP
mode to STA mode when exiting tethering. The presence of stale
IPv4 addresses can in turn lead us to miss a provisioning
notification because we already think we have an IPv4 address.

Change-Id: Ib64559a5a4fa261f483760b69fa7996314e7cc17
2016-04-05 20:28:57 +09:00
Keisuke Kuroyanagi
a46be16612 Merge "Fix: Selection handle behavior in scrolled TextView." into nyc-dev 2016-04-05 09:24:08 +00:00
Keisuke Kuroyanagi
a1a56ed09c Merge "Stop automatically creating action mode in FS extracted mode." into nyc-dev 2016-04-05 07:50:47 +00:00
Keisuke Kuroyanagi
b1b8865017 Fix: Selection handle behavior in scrolled TextView.
When dragging a selection handle, it moves to strange position in
scrolled TextView because scroll position isn't took into account.
This issue was introduced by rebase mistaking in
I2a7e87ad08416f4bd01a5f6.

Bug: 28008281
Change-Id: I6217483fcc0b9a7e661f02a1f276114ddd5031a4
2016-04-05 16:26:16 +09:00
Pavel Zhamaitsiak
f8565cd3f3 Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev 2016-04-05 04:29:12 +00:00
Erik Kline
a91307b240 Delete unused DnsPinger
Change-Id: I1912603f2dabf70bcad19a055651e33e9247bd31
2016-04-05 13:05:52 +09:00
Adam Lesinski
a149c42071 Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev 2016-04-05 02:22:52 +00:00
Phil Weaver
72fde85f7f Remove unusable a11y APIs for ClickableSpans.
This change essentially backs out ag/683646, which added an API to click
on ClickableSpans within a TextView. This API has the flaw, however,
that ClickableSpans are not parcelable, so they are not in general
reported to AccessibilityServices. That means that services will have no
idea what they are activating.

Since the API is not usable end-to-end, I'm backing it out before the
API is final.

Bug: 17726921
Change-Id: I541c6218f2899ff67a6b32a13fd9ae6f3b53b3c4
2016-04-04 18:37:32 -07:00
Ashutosh Joshi
b4cc448946 Merge "App upload to Context hub." into nyc-dev 2016-04-05 01:32:59 +00:00