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

174206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhijun He
1350671f40 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 
automerge: 6bafb86

* commit '6bafb866554a7dea0844438c27a7caea0aab83f2':
  Camera2: relax the EV compensation requirements
 2015-02-05 03:44:01 +00:00
Alan Viverette
6708ac40f2 Move layer-list to be top-level element in seek bar progress 
automerge: bac8e12

* commit 'bac8e12ebd8ed143cd2f1974280f0495c837def4':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 03:35:27 +00:00
Alan Viverette
c2bf7440ba Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev automerge: 80252a9 
automerge: a638c44

* commit 'a638c44bfc6aeb4ba625b3e706a0d525bc0b2ff7':
  Allow top-level drawable container in progressDrawable
 2015-02-05 02:39:32 +00:00
Alan Viverette
fcce8e1a82 Merge "Replace ic_clear with vector icon" into lmp-mr1-dev automerge: 721a957 
automerge: f89e06f

* commit 'f89e06fa58c08ff550a69b268832a2ea338b8700':
  Replace ic_clear with vector icon
 2015-02-05 02:38:25 +00:00
Yang Ni
b457258b5a am da91dfbd: am 1269ff96: Merge "Adds invocable functions to ScriptGroup" 
* commit 'da91dfbdf20271dffce5357195800cf36183ad97':
  Adds invocable functions to ScriptGroup
 2015-02-05 02:31:46 +00:00
Lorenzo Colitti
b43e74bbce am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration." 
* commit '12b26c12483633f7a75d1f1c9ead73eaf6056811':
  Add a unit test for StaticIpConfiguration.
 2015-02-05 02:31:40 +00:00
Yang Ni
da91dfbdf2 am 1269ff96: Merge "Adds invocable functions to ScriptGroup" 
* commit '1269ff961000c726247d510762e42b21562b8c2b':
  Adds invocable functions to ScriptGroup
 2015-02-05 02:24:35 +00:00
Lorenzo Colitti
12b26c1248 am 21702263: Merge "Add a unit test for StaticIpConfiguration." 
* commit '21702263d96341bc13420e2c74af9a4bec6c7907':
  Add a unit test for StaticIpConfiguration.
 2015-02-05 02:24:31 +00:00
Zhijun He
6bafb86655 am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 
* commit '81c80180311803d9faabc0bbd6c0813f44edcf7d':
  Camera2: relax the EV compensation requirements
 2015-02-05 02:15:49 +00:00
Ruben Brunk
e3c0434d97 camera2: Make legacy error handling more robust. 
- Relax internal timeout for JPEG captures in LEGACY mode.
- Make RequestThreadManager.quit() idempotent to avoid queuing
  messages on a dead thread's handler.
- Catch RuntimeExceptions from other Camera1 API methods to
  allow proper cleanup + release of Camera1 API client.

Bug: 19255187
Change-Id: I6cb08bb6b832b0d0df6ee6e8983c35de2df4a408
 2015-02-04 17:26:17 -08:00
Alan Viverette
bac8e12ebd Move layer-list to be top-level element in seek bar progress 
There is a bug in <scale>, but this works around it for now. Removes
the previous fix, which broke the initial state due to the level not
propagating when the current drawable was swapped out.

Bug: 19269656
Change-Id: Ibe586ef4ea326a7ce7516ca42a369c5386c24359
 2015-02-04 17:15:01 -08:00
Alan Viverette
a638c44bfc Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 
automerge: 80252a9

* commit '80252a92e5736c62d26a7ee013c60c4fbfe4b66b':
  Allow top-level drawable container in progressDrawable
 2015-02-05 01:13:06 +00:00
Alan Viverette
f89e06fa58 Merge "Replace ic_clear with vector icon" into lmp-mr1-dev 
automerge: 721a957

* commit '721a95784eb646a1bf42debb68da0efddc8cad3d':
  Replace ic_clear with vector icon
 2015-02-05 01:11:28 +00:00
Zhijun He
81c8018031 Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev 2015-02-05 01:10:29 +00:00
Yang Ni
1269ff9610 Merge "Adds invocable functions to ScriptGroup" 2015-02-05 01:05:08 +00:00
Alan Viverette
80252a92e5 Merge "Allow top-level drawable container in progressDrawable" into lmp-mr1-dev 2015-02-05 00:47:17 +00:00
Alan Viverette
ae12ee34f3 Allow top-level drawable container in progressDrawable 
Bug: 19269656
Change-Id: I82a49d1565f5c49320872f1489ce0f630ac85bd0
 2015-02-04 16:44:02 -08:00
George Mount
8e7c154b07 Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. automerge: c3a043c 
automerge: 23eef1e

* commit '23eef1ec5ea1a9f3f5ec94ac049b8775fdd3562d':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
 2015-02-05 00:32:01 +00:00
Miao Wang
4bd2c00d8d Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" automerge: 9a55cbc 
automerge: 58fd96c

* commit '58fd96c607de7f7f821a0b15fd37bc28323fcfde':
  make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
 2015-02-05 00:27:49 +00:00
Yang Ni
be392ad35e Adds invocable functions to ScriptGroup 
This also includes InvokeID support

Change-Id: I5b59df166ea30b309b8dd9623825ac0e72d03856
 2015-02-04 16:24:48 -08:00
Lorenzo Colitti
21702263d9 Merge "Add a unit test for StaticIpConfiguration." 2015-02-05 00:21:57 +00:00
Alan Viverette
721a95784e Merge "Replace ic_clear with vector icon" into lmp-mr1-dev 2015-02-05 00:20:15 +00:00
George Mount
23eef1ec5e Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. 
automerge: c3a043c

* commit 'c3a043cf0e1c91dcffc2cd596908266ba92a4c28':
  Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS.
 2015-02-05 00:15:50 +00:00
Miao Wang
58fd96c607 Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" 
automerge: 9a55cbc

* commit '9a55cbc0523bb05f15a1ea252c6736ce5060c53e':
  make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)
 2015-02-05 00:07:17 +00:00
Miao Wang
9a55cbc052 Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" 2015-02-05 00:03:05 +00:00
George Mount
c3a043cf0e Fix TODO in javadoc for FEATURE_CONTENT_TRANSITIONS. 
Bug 19254085

Change-Id: I22d4c4e3d1d754ab96741eb0e0290d1ecfc05552
 2015-02-04 15:27:56 -08:00
John Spurlock
e08523684d Fix a few typos in Parcel.java. 
Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16
 2015-02-04 23:18:09 +00:00
Alan Viverette
b0d672376d Replace ic_clear with vector icon 
Fixes the clear icon being really tiny.

Bug: 19248473
Change-Id: I2c87aa9e055d04d96fa6ccf458cfcc642a4d55ab
 2015-02-04 22:49:02 +00:00
John Reck
c7e6b93aba am af6eaf65: Merge "Fix ANR caused by hwuiTask thread" automerge: 5ad36d4 
* commit 'af6eaf656ec0de5fcbea03968daffe2c845e2089':
  Fix ANR caused by hwuiTask thread
 2015-02-04 22:08:27 +00:00
Zhijun He
f1745ce8a8 Camera2: relax the EV compensation requirements 
FULL and LIMITED is allowed to advertise [0,0], which indicates that the
exposure compensation is not supported.

Bug: 19219128
Change-Id: I6020a771201d754351f76617f68c06363fac78e8
 2015-02-04 13:59:43 -08:00
John Reck
af6eaf656e Merge "Fix ANR caused by hwuiTask thread" 
automerge: 5ad36d4

* commit '5ad36d4591e7b3b1b74f0a213d18384f53734ab2':
  Fix ANR caused by hwuiTask thread
 2015-02-04 21:58:39 +00:00
John Reck
5ad36d4591 Merge "Fix ANR caused by hwuiTask thread" 2015-02-04 21:53:48 +00:00
Christopher Tate
c83d3e4b72 Always re-establish kernel alarms when considering new alarm set 
As a backstop against missed alarm delivery / wakeups or clock slew,
make sure to always schedule a kernel alarm for the next alarm events
of interest when we've reexamined the set of deliverable alarms.

Bug 19201933

Change-Id: I3cd37a63dfb0c8258941497d4ba516ed00e2edad
 2015-02-04 13:48:29 -08:00
Elliott Hughes
4c49b1fb77 am b2d7ca7c: am fd2c1307: Merge "Fix build." 
* commit 'b2d7ca7c6ffbb460dd8a8f8cbac8b627a3e27718':
  Fix build.
 2015-02-04 20:37:59 +00:00
Elliott Hughes
b2d7ca7c6f am fd2c1307: Merge "Fix build." 
* commit 'fd2c1307e66573c398ff53eab25ee82735277091':
  Fix build.
 2015-02-04 20:31:45 +00:00
Elliott Hughes
fd2c1307e6 Merge "Fix build." 2015-02-04 20:26:03 +00:00
Elliott Hughes
f953ca2ec8 Fix build. 
Change-Id: Ic14b6de7e7e58ce42ae4cc5ca945e4896e3b7b8f
 2015-02-04 12:24:21 -08:00
Christopher Ferris
9d25fcae85 am 4fb79d14: Merge "Fix comment according to review." 
automerge: ff6cebf

* commit 'ff6cebf0a65f9d6e20497295a1a9c290df85052b':
  Fix comment according to review.
 2015-02-04 19:29:56 +00:00
Christopher Ferris
ff6cebf0a6 am 4fb79d14: Merge "Fix comment according to review." 
* commit '4fb79d14bb6c81f72a92da85420090a05ec2c76d':
  Fix comment according to review.
 2015-02-04 19:15:47 +00:00
Christopher Ferris
4fb79d14bb Merge "Fix comment according to review." 2015-02-04 19:07:15 +00:00
Christopher Ferris
7254c123a1 Fix comment according to review. 
Change-Id: I784f2051cd173425e9a9570ac4555cf835dd277d
 2015-02-04 10:40:12 -08:00
Kenny Guy
e9acb59a91 Only switch user if current user is being wiped 
Only try and switch to owner if the current user
is being removed.

Bug: 19252449
Change-Id: I0143d87360db0834876821cbf52fec4933ecbd35
 2015-02-04 17:55:42 +00:00
Geoff Mendal
8911c2aeb1 Import translations. DO NOT MERGE 
automerge: 140a22d  -s ours

* commit '140a22de8ead0f166eaea320a37b7134f265353e':
  Import translations. DO NOT MERGE
 2015-02-04 14:40:51 +00:00
Geoff Mendal
140a22de8e Import translations. DO NOT MERGE 
Change-Id: Ibdc0a2c8927af8036040a542f6484db1ea65880d
Auto-generated-cl: translation import
 2015-02-04 06:28:45 -08:00
Lorenzo Colitti
83faf72f84 Add a unit test for StaticIpConfiguration. 
Change-Id: I68c735def8a242da0c8f95b7c5ea680ed902dab7
 2015-02-04 17:28:35 +09:00
Miao Wang
f0f6e80bae make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT 
(Native RS)

Change-Id: I23041da03c2c928ceec76037804abb5dc7e6eb64
 2015-02-03 17:16:43 -08:00
Wonsik Kim
b86a45588a am 015fdf39: Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev automerge: d7310bd 
* commit '015fdf392388f1bed3298f9f44012c1a82d7c1a1':
  audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
 2015-02-03 23:52:42 +00:00
Wonsik Kim
015fdf3923 Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev 
automerge: d7310bd

* commit 'd7310bd1499c0b48594a8fbbcbe0c7e80c1e5832':
  audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
 2015-02-03 23:44:34 +00:00
Wonsik Kim
d7310bd149 Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev 2015-02-03 23:39:59 +00:00
Lajos Molnar
d8e6a8b764 am 6999ef34: camera2: limit flexYUV array size in DngCreator automerge: fdb2112 
* commit '6999ef348818ec62a931f539c2caa799728b8a90':
  camera2: limit flexYUV array size in DngCreator
 2015-02-03 23:23:11 +00:00