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

57544 Commits

Author SHA1 Message Date
Peng Xu
7366923927 Merge "[Sensor] Add a constant to match native header" 2016-03-23 17:50:24 +00:00
Abhijith Shastry
869bdebc4d Merge "Document that re-inserting the same blocked number is permitted." into nyc-dev am: 6ec134d 
am: 196ca8e

* commit '196ca8ef2f28e9a677f06d83e5ec7a319e308c4b':
  Document that re-inserting the same blocked number is permitted.
 2016-03-23 17:43:59 +00:00
Abhijith Shastry
196ca8ef2f Merge "Document that re-inserting the same blocked number is permitted." into nyc-dev 
am: 6ec134d

* commit '6ec134dc0d6de2a4dd708dbecd27e5f667c9371c':
  Document that re-inserting the same blocked number is permitted.
 2016-03-23 17:40:07 +00:00
Abhijith Shastry
6ec134dc0d Merge "Document that re-inserting the same blocked number is permitted." into nyc-dev 2016-03-23 17:29:08 +00:00
Michal Karpinski
9e8ccbe43e Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev am: 8aa976b 
am: 4a6a538

* commit '4a6a538df979887ddf96e23d42681340c64014c8':
  Remove legacy DeviceLogging methods from DPM
 2016-03-23 17:04:29 +00:00
Michal Karpinski
4a6a538df9 Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev 
am: 8aa976b

* commit '8aa976b60b0b638a77f9007fa6d1a247815d4b09':
  Remove legacy DeviceLogging methods from DPM
 2016-03-23 17:00:44 +00:00
Michal Karpinski
8aa976b60b Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev 2016-03-23 16:51:55 +00:00
Pablo Ceballos
2c81e3d384 Merge "Java bindings for SurfaceControl::setFinalCrop" into nyc-dev am: 6266d8c 
am: 38f1868

* commit '38f18683b2950dc666d730b960d2fece3da7ebe4':
  Java bindings for SurfaceControl::setFinalCrop
 2016-03-23 16:45:52 +00:00
Pablo Ceballos
38f18683b2 Merge "Java bindings for SurfaceControl::setFinalCrop" into nyc-dev 
am: 6266d8c

* commit '6266d8c959806a359571b0833702fbe46e9748f9':
  Java bindings for SurfaceControl::setFinalCrop
 2016-03-23 16:42:12 +00:00
Pablo Ceballos
6266d8c959 Merge "Java bindings for SurfaceControl::setFinalCrop" into nyc-dev 2016-03-23 16:30:54 +00:00
Abodunrinwa Toki
8c8d552b4e Merge "Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS" into nyc-dev am: ae64758 
am: f99cbc8

* commit 'f99cbc87358ac19b0a9a74e7763eff67455e44f7':
  Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS
 2016-03-23 16:14:46 +00:00
Abodunrinwa Toki
f99cbc8735 Merge "Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS" into nyc-dev 
am: ae64758

* commit 'ae64758eddecec9cb90b6c540fa4687c7f2b2078':
  Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS
 2016-03-23 16:11:05 +00:00
Abodunrinwa Toki
ae64758edd Merge "Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS" into nyc-dev 2016-03-23 16:02:36 +00:00
Michal Karpinski
3bce4bfa04 Remove legacy DeviceLogging methods from DPM 
Those methods were replaced with SecurityLogging ones.

Bug: 27532425
Change-Id: I6952251d9c15f932517e7cb39a7056f35c3a194f
 2016-03-23 13:14:33 +00:00
Chet Haase
68f8d405b1 Merge "Clarify docs around weak references to animator targets" into nyc-dev am: 5084bd6 
am: bdfe232

* commit 'bdfe23202d214d68112eda17bab796ebe068ce1e':
  Clarify docs around weak references to animator targets
 2016-03-23 12:58:48 +00:00
Chet Haase
bdfe23202d Merge "Clarify docs around weak references to animator targets" into nyc-dev 
am: 5084bd6

* commit '5084bd66dd39105f29bf495daabed9af2fdc6979':
  Clarify docs around weak references to animator targets
 2016-03-23 12:54:42 +00:00
Chet Haase
5084bd66dd Merge "Clarify docs around weak references to animator targets" into nyc-dev 2016-03-23 12:46:30 +00:00
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
Abhijith Shastry
91fa6c122d Document that re-inserting the same blocked number is permitted. 
BUG: 27779600
Change-Id: I2cb5cbf5f50ed3bf2183858eb332ea5e6df2a0c6
 2016-03-22 18:24:21 -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
Chet Haase
e60a693d84 Clarify docs around weak references to animator targets 
Issue #26069047 Weak reference to the target in animators
can cause interrupted animations

Change-Id: I719f619006e93a94af907c4de7840c691a5aed37
 2016-03-22 16:20:46 -07: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