Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
241,294 Commits 3 Branches 0 Tags
abe1fc13dbf1f57fa10ec3431dfd074848fa3868
Commit Graph

57522 Commits

Author SHA1 Message Date
Yohei Yukawa
abe1fc13db Merge "Remove redundant IMM#mServedInputConnection." into nyc-dev am: c1a72b6 
am: 06963ca

* commit '06963ca36928f6578116f96eef9fee0b11cd5488':
  Remove redundant IMM#mServedInputConnection.
 2016-03-23 05:55:00 +00:00
Yohei Yukawa
06963ca369 Merge "Remove redundant IMM#mServedInputConnection." into nyc-dev 
am: c1a72b6

* commit 'c1a72b6b74c08b0b304998838d1e792884a6354c':
  Remove redundant IMM#mServedInputConnection.
 2016-03-23 05:51:14 +00:00
Yohei Yukawa
c1a72b6b74 Merge "Remove redundant IMM#mServedInputConnection." into nyc-dev 2016-03-23 05:41:08 +00:00
Yohei Yukawa
afb6558c8f Remove redundant IMM#mServedInputConnection. 
Following two fields have basically the same lifetime.
 - InputMethodManager#mServedInputConnection
 - InputMethodManager#mServedInputConnectionWrapper
Hence we do not need to maintain both of them.

This is a preparation CL for Bug 25332806 and does not change any
user-visible behavior.

Bug: 25332806
Change-Id: I1181e067aa5bedbdf0c7ec1bcec479257aea511c
 2016-03-22 20:53:08 -07:00
Pierre Imai
b21e6adbd8 Merge "Improve NetworkCapabilities command chaining." into nyc-dev am: 82a3637 
am: 8704426

* commit '87044260bed79cd191c21081b2394271797d902f':
  Improve NetworkCapabilities command chaining.
 2016-03-23 01:22:19 +00:00
Pierre Imai
87044260be Merge "Improve NetworkCapabilities command chaining." into nyc-dev 
am: 82a3637

* commit '82a3637fcec8d81b25827d03bd178a83101de6ab':
  Improve NetworkCapabilities command chaining.
 2016-03-23 01:18:47 +00:00
Pierre Imai
82a3637fce Merge "Improve NetworkCapabilities command chaining." into nyc-dev 2016-03-23 01:11:15 +00:00
Paul Stewart
59ff8a11bc Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev am: 68ffbba 
am: 366f851

* commit '366f851e35019816f278de6307c5aec87bbe569f':
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread
 2016-03-22 22:31:06 +00:00
Paul Stewart
366f851e35 Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev 
am: 68ffbba

* commit '68ffbba158579dd8b6f32aa628ec91228786e864':
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread
 2016-03-22 22:27:38 +00:00
Paul Stewart
68ffbba158 Merge changes Iddeebeb8,Idd1e37a3 into nyc-dev 
* changes:
  WifiManager: Use ConnectivityThread
  Create ConnectivityThread
 2016-03-22 22:23:48 +00:00
Alex Klyubin
dbe4efb08a Merge "Unbreak verifying v2 signatures of large APKs." into nyc-dev am: 238ec1f 
am: 481d0f9

* commit '481d0f9a8b344a67160828daa5b650bfb5dcac1b':
  Unbreak verifying v2 signatures of large APKs.
 2016-03-22 19:45:35 +00:00
Alex Klyubin
481d0f9a8b Merge "Unbreak verifying v2 signatures of large APKs." into nyc-dev 
am: 238ec1f

* commit '238ec1f7c720d32daa9b12fcc573b51fa1be54e2':
  Unbreak verifying v2 signatures of large APKs.
 2016-03-22 19:42:52 +00:00
Alex Klyubin
238ec1f7c7 Merge "Unbreak verifying v2 signatures of large APKs." into nyc-dev 2016-03-22 19:40:32 +00:00
Alan Viverette
e3b8f59e56 Merge "Ensure that popup width and height are correct on update" into nyc-dev am: 9e6fe19 
am: a3875b8

* commit 'a3875b854e62bd5a753f0ba9d2a5f6881b92bfca':
  Ensure that popup width and height are correct on update
 2016-03-22 19:40:07 +00:00
Alan Viverette
a3875b854e Merge "Ensure that popup width and height are correct on update" into nyc-dev 
am: 9e6fe19

* commit '9e6fe190468ca83a350e2e59e4622674142d1fd4':
  Ensure that popup width and height are correct on update
 2016-03-22 19:37:23 +00:00
Alan Viverette
9e6fe19046 Merge "Ensure that popup width and height are correct on update" into nyc-dev 2016-03-22 19:31:28 +00:00
Jeff Sharkey
22e8e6ee93 Merge "Update TrafficStats SystemApi docs." into nyc-dev am: c6f0d15 
am: 5e1789f

* commit '5e1789f4f53af0748da609566950214f2f226dc4':
  Update TrafficStats SystemApi docs.
 2016-03-22 18:45:47 +00:00
Jeff Sharkey
754c8dfea7 Merge "Throw the right exception flavor." into nyc-dev am: 7067487 
am: 2a0afa5

* commit '2a0afa58633cf2f7910513575bf67836b62984ff':
  Throw the right exception flavor.
 2016-03-22 18:45:46 +00:00
Jeff Sharkey
5e1789f4f5 Merge "Update TrafficStats SystemApi docs." into nyc-dev 
am: c6f0d15

* commit 'c6f0d15c7d5599f2c13b586ca9c93613a099795d':
  Update TrafficStats SystemApi docs.
 2016-03-22 18:43:02 +00:00
Jeff Sharkey
2a0afa5863 Merge "Throw the right exception flavor." into nyc-dev 
am: 7067487

* commit '706748782173d2f02fbbeda1310e09cd033157a3':
  Throw the right exception flavor.
 2016-03-22 18:43:01 +00:00
Jeff Sharkey
c6f0d15c7d Merge "Update TrafficStats SystemApi docs." into nyc-dev 2016-03-22 18:39:52 +00:00
Jeff Sharkey
7067487821 Merge "Throw the right exception flavor." into nyc-dev 2016-03-22 18:39:39 +00:00
Adam Powell
072ceaca8c Merge "Only call Drawable.setVisible(false) for visible outgoing drawables" into nyc-dev am: 005b272 
am: 6268e87

* commit '6268e87771f65365cfc1fb798ec219b6013c2c2c':
  Only call Drawable.setVisible(false) for visible outgoing drawables
 2016-03-22 18:23:56 +00:00
Adam Powell
6268e87771 Merge "Only call Drawable.setVisible(false) for visible outgoing drawables" into nyc-dev 
am: 005b272

* commit '005b27252929c28bb3f34f139b8521827efb2c88':
  Only call Drawable.setVisible(false) for visible outgoing drawables
 2016-03-22 18:21:12 +00:00
Adam Powell
005b272529 Merge "Only call Drawable.setVisible(false) for visible outgoing drawables" into nyc-dev 2016-03-22 18:16:34 +00:00
Chong Zhang
cc8f1dafce Merge "Don\'t change geometry in relayout if preserve geometry is requested" into nyc-dev am: 3db51d1 
am: e7e66d4

* commit 'e7e66d44a783cc71d70ad79e414187d4c1354b6e':
  Don't change geometry in relayout if preserve geometry is requested
 2016-03-22 18:15:35 +00:00
Adam Powell
35e2ea0203 Only call Drawable.setVisible(false) for visible outgoing drawables 
In framework views where we're handling the new visibility aggregated
call we only update the drawable visibility when we're attached to a
window. For old outgoing drawables being replaced, gate this on
whether the drawable is already marked visible instead.

This catches a case where views being inflated might set drawables in
in a superclass constructor and have them replaced in a later
constructor. Gating the call into a drawable that might invoke its
callback (the view being constructed) avoids potential problems where
overridden methods are called unexpectedly on a view subclass that has
not finished running its constructor.

This is a better check than isAttachedToWindow, as isAttachedToWindow
will return false if the view has been temporarily detached from its
parent by a view-recycling container. In those cases, the view would
not correctly update the outgoing drawable.

Bug 27461617

Change-Id: I733a2dd3e3df0a8d80d5dc542ca7b30064159d5d
 2016-03-22 11:14:16 -07:00
Chong Zhang
e7e66d44a7 Merge "Don\'t change geometry in relayout if preserve geometry is requested" into nyc-dev 
am: 3db51d1

* commit '3db51d19990485be0baa191e4c616ca2367dadf2':
  Don't change geometry in relayout if preserve geometry is requested
 2016-03-22 18:12:54 +00:00
Chong Zhang
3db51d1999 Merge "Don't change geometry in relayout if preserve geometry is requested" into nyc-dev 2016-03-22 18:05:33 +00:00
Felipe Leme
84f77fe651 Merge "Documented that UserDictionary is not directly available anymore." into nyc-dev am: 3ef62ca 
am: 4de3848

* commit '4de3848c2e6f65e3b7fc336df0e13dc2227a507e':
  Documented that UserDictionary is not directly available anymore.
 2016-03-22 17:59:56 +00:00
Felipe Leme
4de3848c2e Merge "Documented that UserDictionary is not directly available anymore." into nyc-dev 
am: 3ef62ca

* commit '3ef62ca404588b9e2b6aeed3defa77e2b3f3a060':
  Documented that UserDictionary is not directly available anymore.
 2016-03-22 17:57:18 +00:00
Felipe Leme
3ef62ca404 Merge "Documented that UserDictionary is not directly available anymore." into nyc-dev 2016-03-22 17:47:36 +00:00
Chong Zhang
6136273888 Don't change geometry in relayout if preserve geometry is requested 
This causes scaling to be applied in the relayout window since the
requested size won't match the window size. Apply the requested size
in repositionChild instead.

bug: 27676101
Change-Id: I03beee2b9fe118a6be329b5fd1338d54e48d9a22
 2016-03-22 10:28:27 -07:00
Aga Wronska
92b77f13f1 Merge "Add config flag to show/hide internal storage. Hide internal storage by default." into nyc-dev am: 5f7d673 
am: c9f5b17

* commit 'c9f5b17df45fe9ee3952c4d0e6d067fc0aa43a82':
  Add config flag to show/hide internal storage. Hide internal storage by default.
 2016-03-22 17:11:42 +00:00
Aga Wronska
c9f5b17df4 Merge "Add config flag to show/hide internal storage. Hide internal storage by default." into nyc-dev 
am: 5f7d673

* commit '5f7d673f3b69019288adcf11325f71aeb2b8af49':
  Add config flag to show/hide internal storage. Hide internal storage by default.
 2016-03-22 17:09:10 +00:00
Aga Wronska
5f7d673f3b Merge "Add config flag to show/hide internal storage. Hide internal storage by default." into nyc-dev 2016-03-22 17:04:28 +00:00
Jeff Sharkey
11caddafb0 Update TrafficStats SystemApi docs. 
Bug: 25726690
Change-Id: I221d62eaaf1e0fca8c26e4f19cb25d306710a849
 2016-03-22 10:20:35 -06:00
Jeff Sharkey
0c2ccd0598 Throw the right exception flavor. 
Change-Id: Ie017fce925ed0122d3820c3f3d91e1b86982a7b1
 2016-03-22 10:05:47 -06:00
Tony Mak
fe5cd89cb9 Revert getUserInfo change and add isManagedPorfile(int userId) am: 8673b28 
am: 438b3f2

* commit '438b3f218dbf3e0fe33676afe5e1e4fcfd4f2dcc':
  Revert getUserInfo change and add isManagedPorfile(int userId)
 2016-03-22 15:32:58 +00:00
Tony Mak
438b3f218d Revert getUserInfo change and add isManagedPorfile(int userId) 
am: 8673b28

* commit '8673b2899e775014336efff44ea88dcac2b25bdd':
  Revert getUserInfo change and add isManagedPorfile(int userId)
 2016-03-22 15:30:21 +00:00
Tony Mak
8673b2899e Revert getUserInfo change and add isManagedPorfile(int userId) 
Bug: 26469166
Change-Id: I60b70170ddc80432fc8f638b1f63c4e9f5212785
 2016-03-22 15:26:05 +00:00
Alan Viverette
f95b2d9aab Ensure that popup width and height are correct on update 
Bug: 26696843
Change-Id: I8b0409aeca02b4ad551689bdf003d95f5435e567
 2016-03-22 11:23:05 -04:00
Jeff Sharkey
e6ee62d4c4 Merge "Store trace files in app-specific dirs." into nyc-dev am: a17b7d0 
am: 95e0922

* commit '95e092228e1a8d306b369f3d402c8def3243b4a9':
  Store trace files in app-specific dirs.
 2016-03-22 15:22:00 +00:00
Jeff Sharkey
95e092228e Merge "Store trace files in app-specific dirs." into nyc-dev 
am: a17b7d0

* commit 'a17b7d0163fc1309b40ed1c38056b71ef9d147fb':
  Store trace files in app-specific dirs.
 2016-03-22 15:19:23 +00:00
Jeff Sharkey
a17b7d0163 Merge "Store trace files in app-specific dirs." into nyc-dev 2016-03-22 15:12:44 +00:00
Pierre Imai
c8419a8717 Improve NetworkCapabilities command chaining. 
setNetworkSpecifier() now returns this.
BUG: 26797290

Change-Id: Ia8bd0836d9ac715408eca102bf4a2d23f044fa72
 2016-03-22 22:29:22 +09:00
Lorenzo Colitti
c54447ddbe Merge "Delete dead code." into nyc-dev am: 3527a2f 
am: 2cacf7c

* commit '2cacf7c1ec0c9f04c541c2ae090064e194dad120':
  Delete dead code.
 2016-03-22 11:45:34 +00:00
Lorenzo Colitti
2cacf7c1ec Merge "Delete dead code." into nyc-dev 
am: 3527a2f

* commit '3527a2f1a2c48107d5065c2c3186e8f4b3ca58d8':
  Delete dead code.
 2016-03-22 11:42:53 +00:00
Lorenzo Colitti
3527a2f1a2 Merge "Delete dead code." into nyc-dev 2016-03-22 11:40:29 +00:00
Benjamin Franz
f6aeab55c4 Merge "Clean up some javadoc issues" into nyc-dev am: 517a958 
am: 37c5dff

* commit '37c5dff49de952fbbc7f8ee00d9d0d0399e60fc1':
  Clean up some javadoc issues
 2016-03-22 11:40:06 +00:00