Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
244,038 Commits 3 Branches 0 Tags
4aa77870f6d29d030fa6343a2bd42e93deb951cc
Commit Graph

63918 Commits

Author SHA1 Message Date
Sunny Goyal
4aa77870f6 Merge "Changing startListening to only fetch views which are bound" into nyc-dev am: 60c74e8 
am: 5e59ea2

* commit '5e59ea211566c03389d221303b76444fdf58065e':
  Changing startListening to only fetch views which are bound

Change-Id: I1fe22a704d0c101f504683d16ea2ea3c552adc35
 2016-04-05 19:01:10 +00:00
Chris Craik
e038368eb4 Merge "Fix software layer alpha" into nyc-dev am: cd6ea77d 
am: 3844aff

* commit '3844affcef076c72a1990540babc885f67580050':
  Fix software layer alpha

Change-Id: I93829f1d888c04a9f3b120eea8810b1453024c47
 2016-04-05 19:01:06 +00:00
Sunny Goyal
5e59ea2115 Merge "Changing startListening to only fetch views which are bound" into nyc-dev 
am: 60c74e8

* commit '60c74e836fc40d65c8ac58c231956f57d26ec7eb':
  Changing startListening to only fetch views which are bound

Change-Id: I811c2cb1603bef597eb958ff7fbd44a93d7075b2
 2016-04-05 18:58:01 +00:00
Chris Craik
3844affcef Merge "Fix software layer alpha" into nyc-dev 
am: cd6ea77d

* commit 'cd6ea77d07204d2ff5e1a0264dc24db215de8614':
  Fix software layer alpha

Change-Id: Ic0e8d3d5fa9e290f036d8e4fc59ee460b03020c9
 2016-04-05 18:57:56 +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
8ade4ed2af Merge "Restore fragment transaction animation state information." into nyc-dev am: dc63f7c6 
am: 5f2be08

* commit '5f2be085d2179e3409d074a4d4cca98c5db71582':
  Restore fragment transaction animation state information.

Change-Id: I6e63aba83c05bc8820f3776496138413e3091b8b
 2016-04-05 17:44:26 +00:00
Oleksiy Vyalov
a4719f0926 Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev am: 81c9ea4 
am: 4588a46

* commit '4588a4685062f128443fd9c2ffc0c37970d45ab5':
  Send nativeDebuggable byte value as part of HELLO response.

Change-Id: I8da9f902930d5a33527d98503cd4fbdb9940a9ef
 2016-04-05 17:44:23 +00:00
George Mount
5f2be085d2 Merge "Restore fragment transaction animation state information." into nyc-dev 
am: dc63f7c6

* commit 'dc63f7c6248276d003d949dbbe407aafd5e7c6bf':
  Restore fragment transaction animation state information.

Change-Id: I4eb87247e789034b2c468bd4764e4d1c9c44ab09
 2016-04-05 17:36:11 +00:00
Oleksiy Vyalov
4588a46850 Merge "Send nativeDebuggable byte value as part of HELLO response." into nyc-dev 
am: 81c9ea4

* commit '81c9ea4034186cd3ff2c387972389eb3397aba46':
  Send nativeDebuggable byte value as part of HELLO response.

Change-Id: I317d3ee0c8c397671c31b858e9c33bffbe53f7cf
 2016-04-05 17:36:09 +00:00
Yohei Yukawa
3b30e66d8a Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev am: e470fcf 
am: eadb88f

* commit 'eadb88fe37825d3f39400c68f2cdc950aec4e30e':
  Fix a remaining View leak in InputMethodManager.

Change-Id: I0c53b76b279c625c79ecdfa22a031ad9eac3e317
 2016-04-05 17:31:44 +00:00
Yohei Yukawa
eadb88fe37 Merge "Fix a remaining View leak in InputMethodManager." into nyc-dev 
am: e470fcf

* commit 'e470fcfeb001d52c4add58f8420709cb6db7e7c4':
  Fix a remaining View leak in InputMethodManager.

Change-Id: I9f83e4de49c527d629091ffc6cf13297bdd6df3b
 2016-04-05 17:28:32 +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
eaa18f954a Merge "(Docs only) Make battery stats process state docs more clear." into nyc-dev 
am: 4345904

* commit '434590405071b462573273637899599332c34187':
  (Docs only) Make battery stats process state docs more clear.

Change-Id: I234a4e3532043fbe00e861bacf48c4240fc2a63b
 2016-04-05 17:01:20 +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
a0200e3702 (Docs only) Make battery stats process state docs more clear. 
Change-Id: I7e86705ec5fa7be8d6a74e708bbf166bec17494f
 2016-04-05 09:54:02 -07:00
Alan Viverette
1ee78d3cfc Merge "Rewrite popup window positioning algorithm" into nyc-dev am: 9d8ec0f 
am: ec9af6f

* commit 'ec9af6f6b2de8643b49ea80a2862aba95acaf0ea':
  Rewrite popup window positioning algorithm

Change-Id: I19598ebc2c1c9efb3b0c296502dfb7f0a2c20ac1
 2016-04-05 16:40:42 +00:00
Alan Viverette
ec9af6f6b2 Merge "Rewrite popup window positioning algorithm" into nyc-dev 
am: 9d8ec0f

* commit '9d8ec0f12ee67129afb4020aa1d91599073cfeab':
  Rewrite popup window positioning algorithm

Change-Id: I8e23de773a1a22278c17e8fb72d4f7b6da1c4921
 2016-04-05 16:35:35 +00:00
Alan Viverette
9d8ec0f12e Merge "Rewrite popup window positioning algorithm" into nyc-dev 2016-04-05 16:29:08 +00:00
Glenn Kasten
7f0fe91b72 Merge "Fix typo" into nyc-dev am: 5cb05f8 
am: c5e036a

* commit 'c5e036a67ebe6083bb3bf567d65890d285de434e':
  Fix typo

Change-Id: Icb732597e13ff8dedadcd4a2300a1c20bfe62bf1
 2016-04-05 15:11:43 +00:00
Glenn Kasten
c5e036a67e Merge "Fix typo" into nyc-dev 
am: 5cb05f8

* commit '5cb05f810b618112443271fdc8f1cf731593657e':
  Fix typo

Change-Id: I1bc1cd930d99e82d0b5563fd8b9b0ce33184ead0
 2016-04-05 15:08:27 +00:00
Kirill Grouchnikov
e16e2554ee Merge "Add a hidden test-only API to get Toolbar\'s navigation view." into nyc-dev am: bbcf432 
am: 94ecef0

* commit '94ecef02b41611992587e5ee4b2d20f37f16c961':
  Add a hidden test-only API to get Toolbar's navigation view.

Change-Id: Iaf8ed798f7f31ccee83d1188337a05657c16488f
 2016-04-05 15:05:35 +00:00
Kirill Grouchnikov
94ecef02b4 Merge "Add a hidden test-only API to get Toolbar\'s navigation view." into nyc-dev 
am: bbcf432

* commit 'bbcf4327d216ff9aa9dcce57c485736d21ffed12':
  Add a hidden test-only API to get Toolbar's navigation view.

Change-Id: Id24760bed597ad0b154e0ec1120d065a4627c7ea
 2016-04-05 15:02:43 +00:00
Glenn Kasten
5cb05f810b Merge "Fix typo" into nyc-dev 2016-04-05 15:00:22 +00:00
Rubin Xu
284e8a441a Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev am: 63d1ee4 
am: 586da02

* commit '586da02e83084174519aead33c1329e76a73b479':
  Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two.

Change-Id: I18ec427abd07e39cfdc90d31be420c988ef1ec60
 2016-04-05 15:00:04 +00:00
Rubin Xu
586da02e83 Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev 
am: 63d1ee4

* commit '63d1ee45eee7e01bd098c7a9694daaea300c1133':
  Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two.

Change-Id: Iab160ad25bafd8850ea75fa8575b12466bf9e16b
 2016-04-05 14:56:44 +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
9fbf66ac37 Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev am: 16aaa3e 
am: 1323b45

* commit '1323b45ff5bd4c0f4b28562b8ef8e3c6cee33fae':
  Fix bad workaround docs in Resources.getDrawable()

Change-Id: I014d58922ffe4c8376ac437bea5c99b99ea08396
 2016-04-05 14:26:47 +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
1323b45ff5 Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev 
am: 16aaa3e

* commit '16aaa3e5355a8a7213bb4cce8383108b9430e3e2':
  Fix bad workaround docs in Resources.getDrawable()

Change-Id: Id40f9e082b21be5d550661a39c0bf826b03159aa
 2016-04-05 14:20:10 +00:00
Robin Lee
1187418a61 Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev am: 691b1a6 
am: 892af97

* commit '892af97b0b62a404f1f14a1824a2398c5e6927d6':
  Switch to work challenge if MP calls resetPassword

Change-Id: I8381ce2e4cbe0de6e8db4cd4c9dac853cf94fa3c
 2016-04-05 14:16:51 +00: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
d2ebee5e73 Revert "Add Preference#onDetachedFromActivity" 
am: b65b710

* commit 'b65b7105cd5d20bf8a9f9c1b10afd6df968bc442':
  Revert "Add Preference#onDetachedFromActivity"

Change-Id: I78a6d99746507b6cde29f25bf161693c5ced4128
 2016-04-05 14:13:32 +00:00
Robin Lee
892af97b0b Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 
am: 691b1a6

* commit '691b1a6005ed373ad75361aa5a1bd120f138f15c':
  Switch to work challenge if MP calls resetPassword

Change-Id: I705c5a52e2a2cae96e0c0df8a2ec50c9b8ae2300
 2016-04-05 14:13:30 +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
212c59f773 Merge changes Ibb63f6b4,Ib64559a5 into nyc-dev am: 19e84f7 
am: c346f72

* commit 'c346f72614d961c0cd5aa4511c08b933af559ada':
  Clean up netd state when tethering fails.
  Clear LinkProperties on interface removed.

Change-Id: Ie9c449cfc24ab889136a360f34ae6aeb00a6df72
 2016-04-05 13:42:38 +00:00
Lorenzo Colitti
c346f72614 Merge changes Ibb63f6b4,Ib64559a5 into nyc-dev 
am: 19e84f7

* commit '19e84f7b750c97d5d7440af16c7ba18bf759e5dc':
  Clean up netd state when tethering fails.
  Clear LinkProperties on interface removed.

Change-Id: I3e6593324fa955ab3c0e590655d0632347f83ec8
 2016-04-05 13:39:10 +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
Jason Monk
8c3fbc487e Merge "Revert "Add Preference#onDetachedFromActivity"" 2016-04-05 13:11:07 +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
6963681c38 Merge "Fix: Selection handle behavior in scrolled TextView." into nyc-dev am: a46be16 
am: ca3fdc2

* commit 'ca3fdc2bdcf82b15ef43cdef0057c00d2b2ab7a5':
  Fix: Selection handle behavior in scrolled TextView.

Change-Id: I4f9ee9b01c66fe43b3aa22fcd4533d3cf299ee1c
 2016-04-05 09:33:26 +00:00
Keisuke Kuroyanagi
ca3fdc2bdc Merge "Fix: Selection handle behavior in scrolled TextView." into nyc-dev 
am: a46be16

* commit 'a46be16612573ce083404e8731a96ec30eba3c48':
  Fix: Selection handle behavior in scrolled TextView.

Change-Id: I36d2bb4d219242c9fe6cc159a0cd3f55489687dd
 2016-04-05 09:30:51 +00: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
d2d8748d6d Merge "Stop automatically creating action mode in FS extracted mode." into nyc-dev am: a1a56ed 
am: 7b6d818

* commit '7b6d8186886f3d845521ecc9b14b42def095567c':
  Stop automatically creating action mode in FS extracted mode.

Change-Id: I4b83a720214baec14b2961ec32d130631b49b3c6
 2016-04-05 07:58:59 +00:00
Keisuke Kuroyanagi
7b6d818688 Merge "Stop automatically creating action mode in FS extracted mode." into nyc-dev 
am: a1a56ed

* commit 'a1a56ed09cb3977c580098113a221c7764d31a58':
  Stop automatically creating action mode in FS extracted mode.

Change-Id: Ia74579cbd4115e3be10ded33cecb0fb16ffe6e90
 2016-04-05 07:56:30 +00:00