Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
cf109c5905 am de56e38e: Merge "Fix default compute thread priority" automerge: 231df77 
* commit 'de56e38e9e8f7f4a54633b66e2952cea776d6ab5':
  Fix default compute thread priority
 2015-01-22 21:18:16 +00:00
Jason Sams
305b8c4737 am 712b05d0: Merge "Add FP16 types to the list of RenderScript types." automerge: 081cda8 
* commit '712b05d00b00a6148852e153ef76dfb5960623e9':
  Add FP16 types to the list of RenderScript types.
 2015-01-22 21:18:02 +00:00
Jason Sams
de56e38e9e Merge "Fix default compute thread priority" 
automerge: 231df77

* commit '231df77eff4e31fead0dfadee6ea6ead980b24ea':
  Fix default compute thread priority
 2015-01-22 21:12:38 +00:00
Jason Sams
712b05d00b Merge "Add FP16 types to the list of RenderScript types." 
automerge: 081cda8

* commit '081cda87e1ed7d1c0f30408dbc6635afc48d98a0':
  Add FP16 types to the list of RenderScript types.
 2015-01-22 21:11:08 +00:00
Jason Sams
231df77eff Merge "Fix default compute thread priority" 2015-01-22 21:08:44 +00:00
Jason Sams
081cda87e1 Merge "Add FP16 types to the list of RenderScript types." 2015-01-22 21:08:03 +00:00
Ying Wang
c5c99734cb am abbf8d41: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 
* commit 'abbf8d419422f8bd0a3a6c5d9a266f21663c4dc4':
 2015-01-22 20:47:28 +00:00
Ying Wang
321e72461b am 301e1def: am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev 
* commit '301e1def7ab741830e1fbc02a291ff295a36c345':
  Check in "current" system API files.
 2015-01-22 20:47:22 +00:00
Ying Wang
abbf8d4194 Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev 2015-01-22 20:41:46 +00:00
Ying Wang
301e1def7a am 24328660: Merge "Check in "current" system API files." into lmp-mr1-dev 
* commit '24328660c8f4f52647022fd0887978b74d607e06':
  Check in "current" system API files.
 2015-01-22 20:41:13 +00:00
Ying Wang
08b7c87881 Merge "Check in "current" system API files." into lmp-mr1-dev 
automerge: 2432866

* commit '24328660c8f4f52647022fd0887978b74d607e06':
  Check in "current" system API files.
 2015-01-22 20:39:52 +00:00
Ying Wang
24328660c8 Merge "Check in "current" system API files." into lmp-mr1-dev 2015-01-22 20:36:06 +00:00
Ricardo Cervera
9331dcb962 am 0f400778: am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs automerge: 65ab86c automerge: 4386d85 
* commit '0f400778714f0357672651868146be73431d0b98':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:39:26 +00:00
Ricardo Cervera
0f40077871 am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs automerge: 65ab86c 
automerge: 4386d85

* commit '4386d856a8ced336d08dd82395b52f30d0c122ae':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:34:20 +00:00
Ricardo Cervera
4386d856a8 am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 
automerge: 65ab86c

* commit '65ab86cf1ad414612ac57e14f581e0ffb1819e14':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:27:57 +00:00
Jason Monk
e1e44ed73a Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev automerge: 959ff1d 
automerge: 485ee97

* commit '485ee978306b4df3f2982a3fc692dcb48a8adb08':
  QS: Fix second line in dual tiles
 2015-01-22 18:04:57 +00:00
Ricardo Cervera
65ab86cf1a am 02d093ca: am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 
* commit '02d093ca675535f1a7f702a9fffd277123cea8ca':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 18:02:30 +00:00
Jason Monk
485ee97830 Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev 
automerge: 959ff1d

* commit '959ff1d3a991b20140843187b2fb08c5a96c202b':
  QS: Fix second line in dual tiles
 2015-01-22 17:59:13 +00:00
Luan Nguyen
2bffc5e7bf am 2700393c: am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) automerge: 6117147 automerge: 563e767 
* commit '2700393c029baf9443622440f5ebad5073429075':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:57:01 +00:00
Ricardo Cervera
02d093ca67 am bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 
* commit 'bdfcd56e7f01b7bb1f50c932792b9528c67892e5':
  docs: Fixes to the watch faces design guidelines
 2015-01-22 17:56:54 +00:00
Ricardo Cervera
bdfcd56e7f Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs 2015-01-22 17:50:48 +00:00
Luan Nguyen
2700393c02 am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) automerge: 6117147 
automerge: 563e767

* commit '563e767a51357ed55c3fc53047fb9f94e4ef3c31':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:49:27 +00:00
Jason Monk
959ff1d3a9 Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev 2015-01-22 17:49:06 +00:00
Ricardo Cervera
4bfde48739 docs: Fixes to the watch faces design guidelines 
Bug: 19001253

Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91
 2015-01-22 09:46:43 -08:00
Luan Nguyen
563e767a51 am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) 
automerge: 6117147

* commit '61171477918ea55c70c706f062019f5cd2194043':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:44:45 +00:00
Luan Nguyen
6117147791 am edb9ba54: am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) 
* commit 'edb9ba54f7be81faacda4ee36824c6f8cd314fb3':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:35:31 +00:00
Luan Nguyen
edb9ba54f7 am 1dd76ea2: docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393) 
* commit '1dd76ea2760f84496a5b82435fc35d7c28a6dd6d':
  docs: Fix companion configuration (18864041) Fix declaration of var and incorrect method call (18617393)
 2015-01-22 17:29:30 +00:00
Christoph Studer
c6a656c9ab SysUI: Don't drop HUN notification when clicked 
A clicked notification is not guaranteed to be removed,
so instead of dropping a clicked HUN notification we have
to release it to the shade.

Bug: 19093631
Change-Id: I73b88af774e49e89c8a601873c48cc5f5eed0224
 2015-01-22 16:26:43 +00:00
Benjamin Franz
fadb2b3a27 Avoid SecurityException when calling getUserData 
Currently we risk getting a SecurityException in a number of places,
where getUserData is called for a different user than the calling user.
To avoid this, the caller is cleared in a helper function.

Bug: 18662452
Change-Id: Ibc131c602e52d9f013fe739a9c18e693181ded67
 2015-01-22 16:16:16 +00:00
Luan Nguyen
1dd76ea276 docs: Fix companion configuration (18864041) 
Fix declaration of var and incorrect method call (18617393)

bug: 18864041
bug: 18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
 2015-01-22 08:15:57 -08:00
Jason Monk
6ece24e106 QS: Fix second line in dual tiles 
QSDualTileLabel is no longer a FrameLayout (now a LinearLayout),
so it does not need the top padding based on the caret size
anymore.

Bug: 18725348
Change-Id: Ibd3aaa20e7cdb35ba585cc5c8981c64efb5c66fe
 2015-01-22 10:40:54 -05:00
Jason Monk
4185030ad4 Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev automerge: 1a5ac5b 
automerge: 3c55689

* commit '3c556895edf01af562a16970ea3aecfd7dc51da7':
  Show connect dialog when selecting secure QS wifi
 2015-01-22 14:22:13 +00:00
Jason Monk
3c556895ed Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev 
automerge: 1a5ac5b

* commit '1a5ac5b415fea8098686aa08bffc6da3ada31938':
  Show connect dialog when selecting secure QS wifi
 2015-01-22 14:14:41 +00:00
Jason Monk
1a5ac5b415 Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev 2015-01-22 14:11:53 +00:00
Narayan Kamath
1194e754a9 Merge "Add support for persist.sys.locale." automerge: dca2332 
automerge: 117f161

* commit '117f161fee52dfa200f89282c487d58c29b41d4f':
  Add support for persist.sys.locale.
 2015-01-22 13:56:01 +00:00
Narayan Kamath
117f161fee Merge "Add support for persist.sys.locale." 
automerge: dca2332

* commit 'dca23321c6f5f0713e7910158f4c874812975077':
  Add support for persist.sys.locale.
 2015-01-22 13:52:19 +00:00
Narayan Kamath
dca23321c6 Merge "Add support for persist.sys.locale." 2015-01-22 13:49:43 +00:00
Narayan Kamath
d30dbb8ae1 Add support for persist.sys.locale. 
AndroidRuntime has been changed to read "ro.product.locale" and
"persist.sys.locale" instead of "ro.product.locale.language" etc.
This is passed down as "-Duser.locale" to the runtime.

The system_server has been changed to write out persist.sys.locale
on locale changes.

bug: 17691569

Change-Id: I93360c8795c9620a133656dc491d13d7b6ed162e
 2015-01-22 13:48:20 +00:00
Nicolas Prevot
2cb240e083 am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74 
* commit '3677117d2bc8b703ccad4eff5914a61508922dd6':
  Never set "Work" or "Personal apps" as prefered activities.
 2015-01-22 10:32:30 +00:00
Nicolas Prevot
3677117d2b Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev 
automerge: ad44f74

* commit 'ad44f7448f0b9aa672cad21300f436e369c8105d':
  Never set "Work" or "Personal apps" as prefered activities.
 2015-01-22 10:24:49 +00:00
Nicolas Prevot
ad44f7448f Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev 2015-01-22 10:22:08 +00:00
Jinsuk Kim
cb8661c08f CEC: Add logic to return to internal source 
This CL introduces a logic that, upon receiving <Inactive Source>
from the active source or a corresponding MHL subcommand, lets
the service return to one of internal inputs.

Introduced to handle it is a new type for HdmiDevice (INACTIVE)
that will be passed to input change listeners. The callback
is expected to transform to other mechanism such as intent,
to let TV app to decide which input to switch to, which will
be one of non-HDMI input that was viewed previously.

Bug: 19008579

Change-Id: I1922f4cd20e9220411061bb9d9fbe5fbc5676d48
 2015-01-22 16:58:26 +09:00
Erik Kline
61b07b4016 Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 147cf4b 
automerge: 4f36150

* commit '4f3615036db441c4a099dc789ebcdf641ac5a987':
  Log interface name and uid when filtering a blocked network.
 2015-01-22 07:18:00 +00:00
Erik Kline
4f3615036d Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev 
automerge: 147cf4b

* commit '147cf4b8c4345f2d086251313583888356317d2d':
  Log interface name and uid when filtering a blocked network.
 2015-01-22 07:10:58 +00:00
Erik Kline
147cf4b8c4 Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev 2015-01-22 07:07:36 +00:00
Jim Miller
54dbd1fd43 am 0ac8dfa3: Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev automerge: ffd1a49 
* commit '0ac8dfa37bf089ade3760a8d703c6a79d98f5ca2':
  Clarify getTrustAgentConfiguration() documentation.
 2015-01-22 02:45:16 +00:00
Jim Miller
0ac8dfa37b Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev 
automerge: ffd1a49

* commit 'ffd1a49c0b8e442aea73c4f5336ea486492981f6':
  Clarify getTrustAgentConfiguration() documentation.
 2015-01-22 02:40:15 +00:00
Jim Miller
ffd1a49c0b Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev 2015-01-22 02:37:39 +00:00
Jinsuk Kim
8175e7b364 am c988e15e: Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev automerge: 7de1ed9 
* commit 'c988e15e1ff8e85981e7cd3347d759b37be1cf2f':
  CEC: Let playback device switch TV input after bootup
 2015-01-22 02:27:26 +00:00
Jinsuk Kim
c988e15e1f Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev 
automerge: 7de1ed9

* commit '7de1ed9d631ecabdf148e4e85bfc2f7f1698a77d':
  CEC: Let playback device switch TV input after bootup
 2015-01-22 02:21:59 +00:00