Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,704 Commits 3 Branches 0 Tags
ed20ebbde5cebc470f426416445b697a0312aac5
Commit Graph

33497 Commits

Author SHA1 Message Date
John Reck
ed20ebbde5 Merge "EGL migration to native" 2014-01-07 23:39:40 +00:00
John Reck
23b797ab51 EGL migration to native 
Move EGL state management to native side for RemoteGLRenderer

Change-Id: I12b0fed70246564d4caebf87374e8bbca655c572
 2014-01-07 14:53:55 -08:00
Ian Rogers
6c6a11648f am 878df18c: am 8dbfde50: am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit '878df18c48fa5f0282cee5ded80238f64826cf84':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 21:47:37 +00:00
Ian Rogers
878df18c48 am 8dbfde50: am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit '8dbfde504787a002de1074a5dfac7eea9d060a43':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 21:45:07 +00:00
Ian Rogers
8dbfde5047 am 0e16e3d7: am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit '0e16e3d7ddcca8fe68bc747b88159eeb6b161785':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 21:41:34 +00:00
Ian Rogers
0e16e3d7dd am c2b50c10: am f11dee79: Merge "Add a call to registerAppInfo for the VMRuntime" 
* commit 'c2b50c10f0bf636562deba1d92ec7b54b13909de':
  Add a call to registerAppInfo for the VMRuntime
 2014-01-07 13:38:44 -08:00
Ian Rogers
f11dee7971 Merge "Add a call to registerAppInfo for the VMRuntime" 2014-01-07 21:31:18 +00:00
Alan Viverette
58a8a678bd Merge "Revert "Allow Views to specify a theme override"" 2014-01-07 20:30:01 +00:00
Alan Viverette
eb14ccf020 Revert "Allow Views to specify a theme override" 
Inheriting the parent view's Context breaks RemoteView inflation.

This reverts commit dd9233253b.

Change-Id: I1c9a940a31169cd42b7356ad58548597a2efbb24
 2014-01-07 20:28:56 +00:00
Dave Platt
5dd0be2936 am 07290a7b: am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '07290a7be312c5da63857903dc6931cea5a2f2ea':
  Fix descriptor leak after accepting connections
 2014-01-07 19:59:21 +00:00
Dave Platt
07290a7be3 am 3bbf7e6a: am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '3bbf7e6aa5a9eda1cc4b1c57da832ebee3bb5dd8':
  Fix descriptor leak after accepting connections
 2014-01-07 19:55:47 +00:00
Dave Platt
3bbf7e6aa5 am 62bac75d: am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '62bac75d677de5398b48487e758dcbdf7bc9d834':
  Fix descriptor leak after accepting connections
 2014-01-07 11:53:12 -08:00
Dave Platt
62bac75d67 am 76e5ca81: Fix descriptor leak after accepting connections 
* commit '76e5ca81b3ba5a4f52126f2ec8907679b4356292':
  Fix descriptor leak after accepting connections
 2014-01-07 11:49:54 -08:00
Narayan Kamath
2e09e57e3d am 0d8c3c46: am 5f83ff6f: am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver" 
* commit '0d8c3c469e4a5e74b702b58307c1e24fa15da3d8':
  AArch64: Use long for pointers in DisplayEventReceiver
 2014-01-07 13:10:08 +00:00
Narayan Kamath
0d8c3c469e am 5f83ff6f: am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver" 
* commit '5f83ff6ffa82fb84df6feab4339054b302ac391e':
  AArch64: Use long for pointers in DisplayEventReceiver
 2014-01-07 13:06:52 +00:00
Narayan Kamath
5f83ff6ffa am e7d7908c: am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver" 
* commit 'e7d7908c28adf77de2cefba4f2a554b770d49def':
  AArch64: Use long for pointers in DisplayEventReceiver
 2014-01-07 13:04:10 +00:00
Narayan Kamath
e7d7908c28 am 02baba25: am 67032754: Merge "AArch64: Use long for pointers in DisplayEventReceiver" 
* commit '02baba25545b232436502a73e2928a1d72fa240e':
  AArch64: Use long for pointers in DisplayEventReceiver
 2014-01-07 05:01:03 -08:00
Ashok Bhat
27285821b7 AArch64: Use long for pointers in DisplayEventReceiver 
For storing pointers, long is used as
native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I3c0855373c0e4bedc172adb82b103586de9219dc
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-01-07 12:48:43 +00:00
Conley Owens
d8a6c59d3d am 5b44325f: am 849ab14d: am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '5b44325fff247558ca36d83930b877dc44e5e219':
  CompoundButton: Let text can be changed by config
 2014-01-06 23:51:24 +00:00
Conley Owens
5b44325fff am 849ab14d: am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '849ab14d7237d3474f6dde3731ab65624ac297ac':
  CompoundButton: Let text can be changed by config
 2014-01-06 23:48:58 +00:00
Conley Owens
849ab14d72 am 7f16047b: am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '7f16047b9efeba7cf82690b0492eaed44ca017df':
  CompoundButton: Let text can be changed by config
 2014-01-06 23:46:00 +00:00
Conley Owens
7f16047b9e am 73a6702e: am 4440a824: Merge "CompoundButton: Let text can be changed by config" 
* commit '73a6702eeaabdeb7b405ec504413d41716ef3508':
  CompoundButton: Let text can be changed by config
 2014-01-06 15:41:50 -08:00
Conley Owens
4440a8244e Merge "CompoundButton: Let text can be changed by config" 2014-01-06 23:36:03 +00:00
Dave Platt
76e5ca81b3 Fix descriptor leak after accepting connections 
After accepting a connection on a listening socket and
storing the resulting FileDescriptor into a newly created
LocalSocketImpl, the new impl's "descriptor was created
locally and should be closed normally" flag should be set.

Bug: 11805817

(cherry picked from commit 3e7305c6bf)

Change-Id: I723d7c5544ee4b6858894c215716cbc32a958df1
 2014-01-06 14:31:28 -08:00
Raph Levien
dcd8258e24 am 971003c9: am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit '971003c9ffc854f4b080af902457e7a6447f692a':
  Re-initialize error after attach
 2014-01-06 17:16:02 +00:00
Raph Levien
971003c9ff am ece5bc9d: am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit 'ece5bc9d692ec1579f45d9e28fdf52c1d966a21b':
  Re-initialize error after attach
 2014-01-06 17:12:18 +00:00
Todd Poynor
a807dbaeed am 91ecb36d: ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE 
* commit '91ecb36df50be3446809e9da2a8f571d157f7549':
  ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE
 2014-01-06 17:12:11 +00:00
Raph Levien
ece5bc9d69 am 7b6b85d2: am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit '7b6b85d260fb4fe739e0af0cc0328e0678872899':
  Re-initialize error after attach
 2014-01-06 17:08:56 +00:00
Raph Levien
7b6b85d260 am d7d07498: am a980c7aa: Merge "Re-initialize error after attach" 
* commit 'd7d0749805b6ae8bb345731ac9dd960f6b5aa5dd':
  Re-initialize error after attach
 2014-01-06 09:06:06 -08:00
Raph Levien
a980c7aa3e Merge "Re-initialize error after attach" 2014-01-06 17:00:49 +00:00
Alan Viverette
3bb64aa83a Merge "Allow Views to specify a theme override" 2014-01-04 02:31:10 +00:00
Zhihai Xu
2208e652d6 Merge "NPE in BluetoothSocket.write()" 2014-01-04 00:54:02 +00:00
Todd Poynor
91ecb36df5 ActivityManagerService use lmkd low memory killer daemon -- DO NOT MERGE 
Change-Id: Ie2f8af1e411c28d7f03be56c356ec39e1d71558e
 2014-01-03 16:30:25 -08:00
Alan Viverette
dd9233253b Allow Views to specify a theme override 
During inflation, any view with a theme attribute will wrap its context
with a theme override. Views inflated using a parent will inherit the
wrapped context.

BUG: 12178430
Change-Id: I3448e5174e94c19960a1e21df5bd6127d0d33c07
 2014-01-03 15:22:53 -08:00
Zhijun He
9e4b8e41fb Merge "Camera2: fix onClosed callback issue" 2014-01-03 00:46:55 +00:00
Zhijun He
b437428b3f Merge "Camera2: remove waitUntilIdle from Camera2 API" 2014-01-03 00:46:28 +00:00
Zhijun He
2db56026bf Camera2: fix onClosed callback issue 
The camera isClosed status shouldn't be checked to fire onClosed callback,
otherwise, onClosed callback is almost never fired when camera close is called
because the camera device is already closed.

Change-Id: I987242d53a12082828a992404ed55ee8a378f93f
 2014-01-02 15:12:00 -08:00
Eino-Ville Talvala
aa161c600d Merge "Camera2: Update android.blackLevel.lock" 2013-12-30 20:55:24 +00:00
quddusc
7999170276 am 6208ef25: am c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit '6208ef25fd9b570770065edbfa71bbb2de8aa511':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-26 23:54:15 +00:00
quddusc
6208ef25fd am c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit 'c609cb0d62b25b2526b8401e576df4dce5aa5a92':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-26 23:49:51 +00:00
quddusc
b889885e9b am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit '34dbf7c32327dc61a106b9a2f50e22cdb6cf6242':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-26 15:33:47 -08:00
Zhijun He
aeb18a8eda Merge "Camera2: Update availableThumbnailSizes java doc" 2013-12-26 22:32:00 +00:00
Zhijun He
d842fcd3af Camera2: remove waitUntilIdle from Camera2 API 
Change-Id: Id034573d8b50aa0bc93bf7f0e776eb55316746ed
 2013-12-26 14:14:04 -08:00
Eino-Ville Talvala
0956af56a2 Camera2: Update android.blackLevel.lock 
Change-Id: I4b3ebdf2043c4b242ac1c851a3be90f795f69a00
 2013-12-26 13:19:10 -08:00
Zhijun He
5a9ff37923 Camera2: Update availableThumbnailSizes java doc 
Bug: 12135317
Change-Id: I4012ed3e7cd6394c5e964aaeb3381b4932c44b11
 2013-12-26 11:49:09 -08:00
Chris Craik
d863a10b28 Add initial APIs for 3d view manipulation. 
Change-Id: I6de00bc577d5b3a1fbc9ca3a3b3668fcfa32b867
 2013-12-20 15:15:01 -08:00
quddusc
34dbf7c323 am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit 'ad7b5993b579994c0b0838783bb8d0a94dffb1ee':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-20 23:10:28 +00:00
quddusc
9072110b82 docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. 
Bug: 6804017

Change-Id: I1e08fc7a9a5db85341c57f6ec04c434a94183cd0
 2013-12-20 14:55:09 -08:00
Chris Craik
3c8a529b3c Merge "Move GLES20DisplayList functionality into DisplayList" 2013-12-20 22:06:02 +00:00
Chris Craik
5438979e49 Move GLES20DisplayList functionality into DisplayList 
Removes unneeded indirection layer

Change-Id: I75d3e369eda2788cbc52a3575c4e1c521e842f59
 2013-12-20 13:53:50 -08:00