Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andres Morales
6722598ef3 Merge "Add a checksum to FRP partition" into lmp-mr1-dev 2014-11-19 18:09:53 +00:00
Chih-hung Hsieh
b380d7eeee am b1e4e89b: Merge "Fix incorrect usage of bool" 
* commit 'b1e4e89b86ee12335fa1398a6b2bc0a0604599de':
  Fix incorrect usage of bool
 2014-11-19 18:09:25 +00:00
Amit Mahajan
5ed01f6427 am bb35bbf1: am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit 'bb35bbf198201fc00858ea56cdf97eae8f2cfdbb':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 18:05:33 +00:00
John Spurlock
ee33301aae am 34a2ee69: am 9d48ec7a: am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '34a2ee695d7411c6b9abd7db3fd105851092bafb':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 18:05:28 +00:00
Geoff Mendal
982c75c321 am 88a080bc: (-s ours) am 5b95c755: (-s ours) am 9792edd1: (-s ours) am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '88a080bc68de7590c4ee1bc69fa9dbd40f6a9055':
  Import translations. DO NOT MERGE
 2014-11-19 18:05:24 +00:00
Geoff Mendal
ecd5556114 am e409561a: (-s ours) am cfe34ebc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'e409561a1757cd9004e50ce5ab3c4e29a747a3c5':
  Import translations. DO NOT MERGE
 2014-11-19 18:05:19 +00:00
Chih-hung Hsieh
b1e4e89b86 Merge "Fix incorrect usage of bool" 2014-11-19 18:01:20 +00:00
Amit Mahajan
bb35bbf198 am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit '6f10d1c34efba28856fea162f1d193319cad2576':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:57:39 +00:00
John Spurlock
34a2ee695d am 9d48ec7a: am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '9d48ec7a5c639226f69377d41c4fcb2d3e17c13e':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 17:57:25 +00:00
Jeff Sharkey
c4b41f565a am e5186c12: am 40602179: Merge "Default icon is shown after uninstalling updated priv-app" 
* commit 'e5186c12ec1c95b75d0fef1a38f94483e31aae6f':
  Default icon is shown after uninstalling updated priv-app
 2014-11-19 17:57:15 +00:00
Geoff Mendal
88a080bc68 am 5b95c755: (-s ours) am 9792edd1: (-s ours) am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '5b95c755821a966b411b164df18b928d2eda71f1':
  Import translations. DO NOT MERGE
 2014-11-19 17:56:45 +00:00
Geoff Mendal
e409561a17 am cfe34ebc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'cfe34ebce6d2a6bd4f682d8f002b8318942ec30d':
  Import translations. DO NOT MERGE
 2014-11-19 17:56:30 +00:00
Geoff Mendal
9ca494586f Merge "Import translations. DO NOT MERGE" 2014-11-19 17:53:08 +00:00
Geoff Mendal
1b23d21ea6 Import translations. DO NOT MERGE 
Change-Id: I35294245089a3132a78442f80df66990de0a1c43
Auto-generated-cl: translation import
 2014-11-19 09:51:54 -08:00
Jeff Sharkey
e5186c12ec am 40602179: Merge "Default icon is shown after uninstalling updated priv-app" 
* commit '4060217905d805897141b028126e0aa51136cf7b':
  Default icon is shown after uninstalling updated priv-app
 2014-11-19 17:49:07 +00:00
xinhe
046f3843f1 Merge "Add configuration to control converting sms destination number" into lmp-dev 2014-11-19 17:47:25 +00:00
Amit Mahajan
6f10d1c34e am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 
* commit 'b22462c57f35404f5b39680a9fb76165968d8faf':
  Adding new setting LTE_SERVICE_FORCED.
 2014-11-19 17:44:33 +00:00
Jeff Sharkey
4060217905 Merge "Default icon is shown after uninstalling updated priv-app" 2014-11-19 17:40:02 +00:00
Amit Mahajan
b22462c57f Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev 2014-11-19 17:38:23 +00:00
John Spurlock
9d48ec7a5c am 2ee054b4: Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 
* commit '2ee054b4f099ce67dffc29329612170305053783':
  Volume: Ensure ring/notif slider is enabled when ringer=vibrate.
 2014-11-19 17:24:09 +00:00
Andreas Gampe
987f79f60b Frameworks/base: Replace LOG_FATAL_IF in core/jni 
Do not use LOG_FATAL_IF in JNI setup. This is one-time on startup
and important enough to always check.

Add a header with common helper definitions. Move to inlined functions
instead of macros to clean up the code.

Change-Id: Ib12d0eed61b110c45d748e80ec36c563e9dec7e5
 2014-11-19 09:21:12 -08:00
John Spurlock
2ee054b4f0 Merge "Volume: Ensure ring/notif slider is enabled when ringer=vibrate." into lmp-mr1-dev 2014-11-19 17:19:15 +00:00
Geoff Mendal
5b95c75582 am 9792edd1: (-s ours) am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '9792edd17c777118f64a585272c9f11112cb22d7':
  Import translations. DO NOT MERGE
 2014-11-19 16:59:27 +00:00
Geoff Mendal
9792edd17c am 5fafd21b: (-s ours) Import translations. DO NOT MERGE 
* commit '5fafd21b1f15930b729f067be7d2c584add3217b':
  Import translations. DO NOT MERGE
 2014-11-19 16:55:43 +00:00
John Spurlock
5eb21f3466 Volume: Ensure ring/notif slider is enabled when ringer=vibrate. 
Although the audio policy makes a distinction between voice capable
and not when determining the default active stream, have the panel
recognize this condition and behave the same way (enable the slider)
on all devices.

Bug: 17405530
Change-Id: If3e1af3078f47bc1205545e919ccc6206020e7b2
 2014-11-19 11:54:53 -05:00
Geoff Mendal
cfe34ebce6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-19 16:49:40 +00:00
Jorim Jaggi
4e857f4ef0 Fade notifications when exiting dozing 
Bug: 18146441
Change-Id: Ifa0cbb8157c65768c3a0c584166ca88c3016b730
 2014-11-19 16:52:43 +01:00
Geoff Mendal
5fafd21b1f Import translations. DO NOT MERGE 
Change-Id: I97c8d622957c88f2186e7d3116726b7ba33703c7
Auto-generated-cl: translation import
 2014-11-19 07:52:29 -08:00
Geoff Mendal
0f2e8a9fd3 Import translations. DO NOT MERGE 
Change-Id: Ic62940d6ffe06c77d7eacfcf53af30850a7e3d38
Auto-generated-cl: translation import
 2014-11-19 07:46:41 -08:00
Geoff Mendal
0dffaa1ea0 am 49a93f52: (-s ours) am 0014addf: (-s ours) am 04b6a6d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '49a93f520fc505df61713b3323e9da9e7559c7d0':
  Import translations. DO NOT MERGE
 2014-11-19 15:35:38 +00:00
Geoff Mendal
49a93f520f am 0014addf: (-s ours) am 04b6a6d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '0014addf883675613648713e7c01b70fb780a5dc':
  Import translations. DO NOT MERGE
 2014-11-19 15:28:42 +00:00
Geoff Mendal
0014addf88 am 04b6a6d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '04b6a6d3a17e40599d90ccabc6a8481a62dd2ae1':
  Import translations. DO NOT MERGE
 2014-11-19 15:25:23 +00:00
Geoff Mendal
04b6a6d3a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-19 15:19:34 +00:00
Geoff Mendal
2a42085896 Import translations. DO NOT MERGE 
Change-Id: Ibfc1a6ef7529620c86fb25ac4ae4b27258a810c1
Auto-generated-cl: translation import
 2014-11-19 07:17:01 -08:00
Jason Monk
9da2791f69 am 4854657f: am 90bec300: am 56dd1f1e: Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 
* commit '4854657f0eaeef4c51b51976561eafd403bc5353':
  Automatically enable BT when entering BT QS panel
 2014-11-19 15:13:27 +00:00
Jason Monk
4854657f0e am 90bec300: am 56dd1f1e: Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 
* commit '90bec3001294601227c3578377325224b02180cc':
  Automatically enable BT when entering BT QS panel
 2014-11-19 15:07:54 +00:00
Jason Monk
90bec30012 am 56dd1f1e: Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 
* commit '56dd1f1eb6fdca10ea2f33d8420e6051e14ed435':
  Automatically enable BT when entering BT QS panel
 2014-11-19 15:03:46 +00:00
Jason Monk
56dd1f1eb6 Merge "Automatically enable BT when entering BT QS panel" into lmp-mr1-dev 2014-11-19 14:58:40 +00:00
Narayan Kamath
343f478241 Tell installd when boot completes. 
installd can then clear the ".booting" marker from the dalvik-cache
(owned by root). This marker is used to detect boot loops.

bug: 18280671

(cherry picked from commit 76a748e62f)

Change-Id: I2364c05837ac04d428b5a34ab1802964a11d2df4
 2014-11-19 14:41:08 +00:00
Geoff Mendal
3bd8304922 Merge "Import translations. DO NOT MERGE" 2014-11-19 14:40:26 +00:00
Geoff Mendal
3e1f102d48 Import translations. DO NOT MERGE 
Change-Id: Ib9109f2785d00192370803b6f1c577d480bc009b
Auto-generated-cl: translation import
 2014-11-19 06:31:47 -08:00
Geoff Mendal
2081228b82 Import translations. DO NOT MERGE 
Change-Id: Ifac2744b085fd628d2688543243f52e2bec82292
Auto-generated-cl: translation import
 2014-11-19 06:27:10 -08:00
Zoltan Szatmary-Ban
e9119876a2 Add new subcommand 'set-active-admin' to the dpm command. 
Bug: 18002490
Change-Id: I91746032df08ef0fdef05711114691da18796a0a
 2014-11-19 13:47:11 +00:00
Dongwon Kang
5f3cb4a584 TIF: implement gatherTransparentRegion() and dispatchDraw() in TvView. 
Background: because the hole-punching code lives only in SurfaceView,
the overlay view can be covered by the application if the TV input
changes the position of SurfaceView via Session.layoutSurface().
This change punches a hole as large as TvView so that the underlying
overlayview can be shown properly.

Bug: 18420642
Change-Id: If9a829367083ce2002a4c4a4e4a4bbb623f7ad96
 2014-11-19 20:27:55 +09:00
Nicolas Prevot
97166e0790 am 9b07760d: am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '9b07760dbcc19f47b9ee02081b26a9bbc2a40157':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 10:08:38 +00:00
Nicolas Prevot
9b07760dbc am 439f17e6: am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '439f17e622b3aaca2003eeeee2bb423abe6777a9':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 10:01:51 +00:00
Nicolas Prevot
439f17e622 am 76ea69b3: Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 
* commit '76ea69b35e45f4b23dfb7b39c6cd790b00576526':
  Fix javadoc in UserManager mentioning application restrictions.
 2014-11-19 09:55:44 +00:00
Nicolas Prevot
76ea69b35e Merge "Fix javadoc in UserManager mentioning application restrictions." into lmp-mr1-dev 2014-11-19 09:46:54 +00:00
Yigit Boyar
98d5f04f91 Improve GridLayout's weight calculations 
This CL improves the method by which excess space is distributed in GridLayout.
Previously, GridLayout would assume weights were arranged in a 'line' and
sum the weights in the assumed line to figure out the proportional allocation
to each view. The system involved running GridLayout's internal constraint 
solver twice.

Behavior was unspecified (and surprising) when weights appeared in views
that were not linked together linearly, typically leaving the last view 
in each axis with more space than expected (in GridLayout's Bellman-Ford 
constraint solver, remaining space goes to the last span of the axis).

This CL changes the weight distribution mechanism to effectively integrate it
with the Bellman-Ford constraint resolution algorithm. It does this
by returning a boolean value from the constraint solver saying whether or
not the constraints could be solved and then using a binary chop to find 
a maximum amount of space that can be distributed without violating the 
constraints.

This implementation runs the solver log(<axis size> * <number of Views>)
times until finding the maximum amount of space that can be distributed according
to the weights without causing a contradiction. We expect the cost of this
variation to be around a factor of 10 worse than the previous implementation
but to provide a simple and general definition of space distribution via
weights that will be open to many future optimizations.

As a side effect, this CL also fixes a bug in GridLayout where remaining space
was distributed only along the major axis.

Bug: 17485996
Change-Id: I120f39e95e90b5b35072ef8a6c348ec541aae42a
 2014-11-19 03:23:18 +00:00
Alan Viverette
67fd871bc5 am ea3219ff: am 4be155e8: am a489f0b3: Merge "Re-initialize data when changing time picker 24-hour mode" into lmp-mr1-dev 
* commit 'ea3219ffa9a6b23f6a2bbcbbe6f6ca83490eadad':
  Re-initialize data when changing time picker 24-hour mode
 2014-11-19 02:48:41 +00:00