drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
237,548 Commits 1 Branch 0 Tags
Commit Graph

237548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tony Mak
73ebf33d76 Merge "getProfiles should only returns non-partial user info" into nyc-dev 2016-04-05 17:24:30 +00:00
Yohei Yukawa
e470fcfeb0 Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev 2016-04-05 17:22:47 +00:00
Sudheer Shanka
f4b30e2147 Merge "Remove the admin from the removing list when refreshing that admin." into nyc-dev 2016-04-05 17:21:36 +00:00
Junda Liu
a27cf024e5 Merge "Add public API for sim authentication." into nyc-dev 2016-04-05 17:03:31 +00:00
Tony Mak
80189cdece getProfiles should only returns non-partial user info 
Bug: 26928524
Change-Id: I537bb0a9632cad603717a367b81d5e072452a6d7
 2016-04-05 16:59:39 +00: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
a7d301c5d4 Merge "Fix issue #28001806: Background check is incorrectly restricting binding of services" into nyc-dev 2016-04-05 16:54:36 +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
Dianne Hackborn
4fb9c4af59 Fix issue #28001806: Background check is incorrectly restricting binding of services 
Change-Id: Ie79937d2696e28651c8ef2bdcc5c9c84f9f801c6
 2016-04-05 09:53:09 -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
Alan Viverette
29e2d427a4 Merge "Make Material switch style public" into nyc-dev 2016-04-05 14:51:04 +00:00
Bill Yi
5798a425ec Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:22:21 +00:00
Bill Yi
06296dbb87 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:21:52 +00:00
Bill Yi
22092d7794 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:16:49 +00:00
Bill Yi
ba6880ec51 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:16:18 +00:00
Bill Yi
8a9cc710f2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:15:41 +00:00
Alan Viverette
16aaa3e535 Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev 2016-04-05 14:15:10 +00:00
Bill Yi
a0480cc36b Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:14:57 +00:00
Alan Viverette
9e902f86ac Make Material switch style public 
Bug: 28001482
Change-Id: I0dcbf585db13d2efffd09ec0e329170114f372a1
 2016-04-05 10:14:27 -04:00
Jason Monk
b65b7105cd Revert "Add Preference#onDetachedFromActivity" 
This reverts commit e18dc50c63110a57cfc29ec9bd21bf3f59abb6b4.
Fixes: 27807793

Change-Id: Ib0384e3deb8d6376265e8e60f14490de128c9b68
(cherry picked from commit eff3ca5480789c51768a3a1697503fbbdadc1bd6)
 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
Jason Monk
723a65a51b Merge "Fix Build" into nyc-dev 2016-04-05 13:49:41 +00:00
Jason Monk
7c359bf6df Fix Build 
Previous revert didn't catch test-current.txt

Change-Id: I82575361bcc4f3c7e05dbec4cbe5201b03717bcb
 2016-04-05 09:47:40 -04:00
Bill Yi
1a548b2a89 Import translations. DO NOT MERGE 
Change-Id: Ibc7139b72a805e48a1906368d25df01e55f68b9b
Auto-generated-cl: translation import
 2016-04-05 06:44:13 -07:00
Bill Yi
1f61b4b976 Import translations. DO NOT MERGE 
Change-Id: Iacf5ebcf0264fa13b097db13948f9b880f8e19c2
Auto-generated-cl: translation import
 2016-04-05 06:37:59 -07: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
c42c97540f Clean up netd state when tethering fails. 
If we do not call untether, NetworkController will still think
that wlan0 is part of the LOCAL network, and thus any attempt to
use wlan0 for anything else is doomed to fail.

Bug: 27917299
Change-Id: Ibb63f6b477b85b92281d9667adf8af148deb266c
 2016-04-05 20:28:57 +09: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
Diego Perez
4ce88b10ab Merge "Separate inflate from render step" into nyc-dev 2016-04-05 08:17:46 +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
Bill Yi
9e59dfad9a Import translations. DO NOT MERGE 
Change-Id: I127b5c781f20c942712801cf9b044d7b27403b07
Auto-generated-cl: translation import
 2016-04-05 00:32:16 -07: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
Bill Yi
f65a843661 Import translations. DO NOT MERGE 
Change-Id: Ib8200b22451664277e49d59489e1727b281fa960
Auto-generated-cl: translation import
 2016-04-05 00:18:26 -07:00
Bill Yi
0b3aebbe03 Import translations. DO NOT MERGE 
Change-Id: I313e43e4b0f2f90265415bfb36ac3316dcb58e00
Auto-generated-cl: translation import
 2016-04-05 00:12:38 -07:00
Bill Yi
f1ac762db1 Import translations. DO NOT MERGE 
Change-Id: I2ee1e4554a52b1932121c963a8dd99a19e8bc990
Auto-generated-cl: translation import
 2016-04-05 00:08:13 -07:00
Aga Wronska
2209860597 Merge "Hide 'select all' menu option when ALLOW_MULTIPLE intent is not passed in DocumentsActivity. Make 'select all' select only enabled files." into nyc-dev 2016-04-05 04:34:09 +00:00
Pavel Zhamaitsiak
f8565cd3f3 Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev 2016-04-05 04:29:12 +00:00
Sudheer Shanka
7c92133134 Remove the admin from the removing list when refreshing that admin. 
Change-Id: I9b597a116db4f1fb894427b4e885f29c3e94abdb
Fixes: 27909181
 2016-04-04 21:05:54 -07:00
Erik Kline
39ca5c2280 Merge "Delete unused default DNS setting code" into nyc-dev 2016-04-05 04:00:28 +00:00
Erik Kline
5db3f10e9a Merge "Move from on464XlatChange() to setNeighborDiscoveryOffload()" into nyc-dev 2016-04-05 03:55:42 +00:00
Bill Yi
f7d28faa04 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 03:22:27 +00:00
Erik Kline
3609013c86 Delete unused default DNS setting code 
Change-Id: I601a647714171f205d179d6fef6c112949fc5a94
 2016-04-05 11:48:01 +09:00
Lorenzo Colitti
cd404a2fc3 Merge "Add APF code to drop ARP IPv4 requests not for us" into nyc-dev 2016-04-05 02:46:39 +00:00
Erik Kline
5c2e9224a7 Move from on464XlatChange() to setNeighborDiscoveryOffload() 
Bug: 26238390
Change-Id: I0f971fbf04e44cb61017653f944d71e1f6d128b4
 2016-04-05 11:39:14 +09:00
Adam Lesinski
a149c42071 Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev 2016-04-05 02:22:52 +00:00
Sergei Vasilinetc
5169c62c6c Merge "Fix opacity setup in FrameBuilder" into nyc-dev 2016-04-05 01:54:47 +00:00