Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
238,781 Commits 3 Branches 0 Tags
d707fa3d009e299d5bcaf2859fa3e2f3dc5f46fd
Commit Graph

57002 Commits

Author SHA1 Message Date
Peng Xu
d707fa3d00 [Sensor] Add a constant to match native header 
am: 370985d

* commit '370985d00a04c0d6977929cd8daf05c932443b0d':
  [Sensor] Add a constant to match native header
 2016-03-23 18:03:25 +00:00
Peng Xu
370985d00a [Sensor] Add a constant to match native header 
This CL add private sensor type base constant to java file to match
C header file.

It is defined that all vendor sensor types have to be >= 0x10000.
There is a constant in sensor.h for reference. However, there is
no such constant defined in Sensor.java before. This CL adds it.

Change-Id: Ia8f8c06583c62879e51779815051c346f1a9cd14
(cherry picked from commit 1795e14dab)
 2016-03-23 17:51:02 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
Abodunrinwa Toki
07177140e4 Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS 
Bug: 26943892
Change-Id: I1eb6bd7a9e816190b96dc1516d5874eb966385a4
 2016-03-22 17:12:22 +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
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
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
2cacf7c1ec Merge "Delete dead code." into nyc-dev 
am: 3527a2f

* commit '3527a2f1a2c48107d5065c2c3186e8f4b3ca58d8':
  Delete dead code.
 2016-03-22 11:42:53 +00:00