drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
174,080 Commits 1 Branch 0 Tags
Commit Graph

174080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryce Lee
a20e430d0a am 13c70441: Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev 
* commit '13c7044186b90f7f63e7a17996222edfb18460f5':
  Revert "Expose userActivityTimeout through @SystemApi getter/setter."
 2015-02-06 19:42:38 +00:00
Bryce Lee
13c7044186 Merge "Revert "Expose userActivityTimeout through @SystemApi getter/setter."" into lmp-mr1-modular-dev 2015-02-06 19:35:43 +00:00
Bryce Lee
0dad572090 Revert "Expose userActivityTimeout through @SystemApi getter/setter." 
This reverts commit 40a0ee65f269cffa7d3fb0646bd987a69df5c2d0.

Change-Id: Ida1a40db25643f97e82d517bcf147f23e4a3a0fe
 2015-02-06 19:35:33 +00:00
Bryce Lee
a5669730d0 am 4a88acfc: Merge "Make THEATER_MODE_ON a System API." into lmp-mr1-modular-dev 
* commit '4a88acfcc30544fa3424020b1c071d2954a47cb2':
  Make THEATER_MODE_ON a System API.
 2015-02-06 19:09:32 +00:00
Bryce Lee
7b5f9cde6a am 4cccd58e: Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev 
* commit '4cccd58e4219ff1e974db201e064c85063dd262f':
  Expose userActivityTimeout through @SystemApi getter/setter.
 2015-02-06 19:09:28 +00:00
Bryce Lee
4a88acfcc3 Merge "Make THEATER_MODE_ON a System API." into lmp-mr1-modular-dev 2015-02-06 19:05:45 +00:00
Bryce Lee
4cccd58e42 Merge "Expose userActivityTimeout through @SystemApi getter/setter." into lmp-mr1-modular-dev 2015-02-06 19:05:22 +00:00
Neil Fuller
c63efbd928 am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 
* commit '022cf57f82e40a103c4a48c083a59d7fa4936668':
  Avoid static initialization of Layout from TextUtils
 2015-02-06 17:51:05 +00:00
Neil Fuller
022cf57f82 am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 
* commit 'a08934cf54e3120d5019839a4b6d553b3364e8d1':
  Avoid static initialization of Layout from TextUtils
 2015-02-06 17:44:49 +00:00
Neil Fuller
a08934cf54 am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 
* commit 'f789d45b24acc3745ccc97adb687502d488404f6':
  Avoid static initialization of Layout from TextUtils
 2015-02-06 17:37:32 +00:00
Neil Fuller
f789d45b24 Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev 2015-02-06 17:30:47 +00:00
Kenny Guy
afca06105c am b6332fd2: am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 
* commit 'b6332fd21a97b846015693684cee9e2af3381f0a':
  Fix mangled javadoc for setPermittedInputMethods.
 2015-02-06 16:37:11 +00:00
Chong Zhang
c71d0ccfc7 am 1836f6b8: am eceae03f: am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
* commit '1836f6b8f3f34ad31acc04f861c380b186e52193':
 2015-02-06 16:36:50 +00:00
Alan Viverette
c9dff4bd04 am bbde1213: am 80b381c0: am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
* commit 'bbde12138c748fbe136db5fa9f101ccb9c52ab7b':
 2015-02-06 16:36:31 +00:00
Kenny Guy
b6332fd21a am 70fb0ab4: am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 
* commit '70fb0ab44e1b8d56f2cbe33d73afd3897c7584d1':
  Fix mangled javadoc for setPermittedInputMethods.
 2015-02-06 15:37:53 +00:00
Kenny Guy
70fb0ab44e am 8debf213: Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 
* commit '8debf21357477083a716275e2a32cb7169d42c47':
  Fix mangled javadoc for setPermittedInputMethods.
 2015-02-06 15:28:21 +00:00
Kenny Guy
8debf21357 Merge "Fix mangled javadoc for setPermittedInputMethods." into lmp-mr1-dev 2015-02-06 15:22:23 +00:00
Neil Fuller
d29bdb266d Avoid static initialization of Layout from TextUtils 
This works around a bug in standalone (e.g. non-Zygote)
runtimes when a device is attached to a host that is running
DDM.

There is a race condition:

When the runtime receives a HELLO from DDM it calls
TextUtils.isEmpty().

Calling any TextUtils methods statically initializes
Layout. Layout has dependencies on other classes, which in
turn have dependencies on native methods that are not always
registered when the call takes place. Registration and DDM
handling are done in separate threads.

This is not a fix, merely a workaround until the race can
be resolved.

Bug: 18081539
Change-Id: If1bd3de6597bc93da381c8f86dacf40156449561
 2015-02-06 10:29:54 +00:00
Elliott Hughes
cf657ad46c am ae0bee53: am 81b84311: Merge "Fix clang build." 
* commit 'ae0bee53b84d4ffda84270852ace1841e13f5db8':
  Fix clang build.
 2015-02-06 05:50:01 +00:00
Elliott Hughes
ae0bee53b8 am 81b84311: Merge "Fix clang build." 
* commit '81b8431173837fe9ea21990948d6af30809fb056':
  Fix clang build.
 2015-02-06 05:43:15 +00:00
Elliott Hughes
81b8431173 Merge "Fix clang build." 2015-02-06 05:37:33 +00:00
Elliott Hughes
7ff53fa0d4 Fix clang build. 
Change-Id: If795820ef6431fee9c9c3862cc91ad4a9cc04507
 2015-02-05 21:36:10 -08:00
Chong Zhang
3968f0c2df am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
automerge: eceae03

* commit 'eceae03f6a21b36baddabe4ca5a2c1d9d238240a':
  reset col position to 1 on row PAC
 2015-02-06 03:17:36 +00:00
Bryce Lee
40a0ee65f2 Expose userActivityTimeout through @SystemApi getter/setter. 
This change will make it accessible to unbundled wear home.

Bug: 18721755
Change-Id: I0634dbc5d8d8ebe25e45af0a1b1186fda5254dd5
 2015-02-06 02:42:52 +00:00
Bryce Lee
e847b5baef Make THEATER_MODE_ON a System API. 
Bug: 19043538
Change-Id: Ibf0d6b45868ca90eb792a40c5d1b1395774486b8
(cherry picked from commit cdfebd60fad097fa58d45f13104990cd323be61b)
 2015-02-06 02:41:09 +00:00
Chong Zhang
1836f6b8f3 am eceae03f: am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
* commit 'eceae03f6a21b36baddabe4ca5a2c1d9d238240a':
  reset col position to 1 on row PAC
 2015-02-06 02:26:14 +00:00
Chong Zhang
eceae03f6a am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
* commit '6cad6513e0058467d11f4cf99519cf79eb65d48f':
  reset col position to 1 on row PAC
 2015-02-06 02:12:16 +00:00
Chong Zhang
6cad6513e0 Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 2015-02-06 02:06:24 +00:00
Alan Viverette
cbe32de454 am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
automerge: 80b381c

* commit '80b381c0736c1af43801b8ed26428abdf4d437b3':
  Mutate scroll bar drawables
 2015-02-06 00:53:09 +00:00
Chong Zhang
6286f8ec05 reset col position to 1 on row PAC 
bug: 19284568
Change-Id: I7d439027ab6411bcd5c149580babee80dc5f9478
 2015-02-05 16:46:06 -08:00
Alan Viverette
bbde12138c am 80b381c0: am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
* commit '80b381c0736c1af43801b8ed26428abdf4d437b3':
  Mutate scroll bar drawables
 2015-02-06 00:31:37 +00:00
Alan Viverette
80b381c073 am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
* commit '9a166c7da3d77c4b9801dbe249f78149649d5b0e':
  Mutate scroll bar drawables
 2015-02-06 00:25:33 +00:00
Alan Viverette
9a166c7da3 Merge "Mutate scroll bar drawables" into lmp-mr1-dev 2015-02-06 00:19:44 +00:00
Filip Gruszczynski
96f3462958 am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev 
* commit '7acd679cb3f3c543ad71aaeb1057bcbef3a880e5':
  Add wallpaper controlling system apis.
 2015-02-06 00:09:41 +00:00
Filip Gruszczynski
943c09d720 am 00de5c9f: Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev 
* commit '00de5c9f04e42045bd0299c06a9cc05187b1dff0':
  Add hidden shutdown method to PowerManager.
 2015-02-06 00:09:35 +00:00
Alan Viverette
f8512ce081 Mutate scroll bar drawables 
Bug: 19285726
Change-Id: I4bb596433c1fa1cc4e2fa53d0cdae992f9add858
 2015-02-05 15:58:56 -08:00
Filip Gruszczynski
7acd679cb3 Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev 2015-02-05 23:19:01 +00:00
Filip Gruszczynski
00de5c9f04 Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev 2015-02-05 23:18:41 +00:00
Alan Viverette
c3ea7e39e5 am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev 
automerge: eb6f3f8

* commit 'eb6f3f885154914eec6a747265d1f568ae50380c':
  Update preference dialog padding to Material
 2015-02-05 23:12:34 +00:00
Sanket Padawe
0a4c2646f4 am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev 
automerge: 4eed340

* commit '4eed340437d23a9b4fabf2881557325b863af23c':
  Suppress phone number from logcat.
 2015-02-05 23:10:57 +00:00
John Spurlock
c46b68c7a2 am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
automerge: 29fabd8

* commit '29fabd8988b95e5ff41167a74dfc67937988b3db':
  Fix a few typos in Parcel.java.
 2015-02-05 23:08:51 +00:00
Ruben Brunk
78ee980738 am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 
automerge: 2a11473

* commit '2a114737c636e69a65478778c6edb24c2266518e':
  camera2: Make legacy error handling more robust.
 2015-02-05 23:07:13 +00:00
Adam Lesinski
88c5abb33f am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev 
automerge: abc88d0

* commit 'abc88d0743924441bf7fcd3085e3305b076f5af5':
  Make ArrayMap.EMPTY immutable
 2015-02-05 23:05:40 +00:00
Dianne Hackborn
4fdac61388 am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev 
automerge: 29039a2

* commit '29039a2bdbadcc427a966f5e7a6021fd424c4266':
  Always re-establish kernel alarms when considering new alarm set
 2015-02-05 23:04:21 +00:00
Jason Monk
ba87ba5e4c am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 
automerge: 6d72d46

* commit '6d72d46b4b6fe0ec72c24ea5369c6d92fd29ba52':
  Ellipsize QS detail items when needed
 2015-02-05 23:02:57 +00:00
Alan Viverette
00a1fa3e43 am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 
automerge: f1a4d0e

* commit 'f1a4d0e864f17c59c0e292e8f1161ab4397e5ba4':
  Invalidate SubtitleView during setText()
 2015-02-05 23:00:44 +00:00
Alan Viverette
eb6f3f8851 am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev 
* commit '69a62a8b0df71b0a26d55c29c71dd311dbe174c7':
  Update preference dialog padding to Material
 2015-02-05 22:11:32 +00:00
Alan Viverette
69a62a8b0d Merge "Update preference dialog padding to Material" into lmp-mr1-dev 2015-02-05 22:06:36 +00:00
Sanket Padawe
4eed340437 am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev 
* commit '04db979728ce0c2ea67c5ac5d7a1c2f02f53863d':
  Suppress phone number from logcat.
 2015-02-05 20:56:31 +00:00
Sanket Padawe
04db979728 Merge "Suppress phone number from logcat." into lmp-mr1-dev 2015-02-05 20:51:10 +00:00