OSDN Git Service
Zhijun He [Mon, 3 Feb 2014 23:32:43 +0000 (15:32 -0800)]
am
6c90d439: Merge "Camera2: Update sceneFlicker tag spec"
* commit '
6c90d439758add5981dee67674d0aafc5208f427':
Camera2: Update sceneFlicker tag spec
Zhijun He [Mon, 3 Feb 2014 23:32:40 +0000 (15:32 -0800)]
am
37bac0ae: Merge "Camera2: update lens state tag specs"
* commit '
37bac0aecbf656f0d8b1f0145fbbb30743c59e9b':
Camera2: update lens state tag specs
Christopher Tate [Mon, 3 Feb 2014 23:32:36 +0000 (15:32 -0800)]
am
31b4834b: Merge "Introduce "IdleService" API to expose idle-time maintenance to apps"
* commit '
31b4834b6d5eb1e5156950930b69221819a84766':
Introduce "IdleService" API to expose idle-time maintenance to apps
Zhijun He [Mon, 3 Feb 2014 23:32:33 +0000 (15:32 -0800)]
am
ef83738d: Merge "Camera2: Update pixelArraySize and analog sensitivity tags"
* commit '
ef83738da65a79defc6dc4f12433b327d670127e':
Camera2: Update pixelArraySize and analog sensitivity tags
Geoff Mendal [Mon, 3 Feb 2014 23:32:31 +0000 (15:32 -0800)]
am
4c2315d1: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
4c2315d10c462cbebe098cae656675a46e8cfe3d':
Import translations. DO NOT MERGE
John Spurlock [Mon, 3 Feb 2014 23:32:26 +0000 (15:32 -0800)]
am
53a470af: am
be878d87: am
b6a4926c: am
647db9fa: am
76ecd66a: am
0196e561: Fix typo in ImageView.java
* commit '
53a470af6574dea27a2701e763e6c6b10be75af7':
Fix typo in ImageView.java
Alan Viverette [Mon, 3 Feb 2014 23:32:18 +0000 (15:32 -0800)]
am
edc4664d: Fix broken build in BridgeResources
* commit '
edc4664d60af1f124d05f0a2b6ba58b837630f51':
Fix broken build in BridgeResources
Kenny Root [Mon, 3 Feb 2014 23:32:15 +0000 (15:32 -0800)]
am
faa1057d: am
aa6ff54e: am
85ee57d1: am
c064a1b5: Merge "Remove DRLCertFactory"
* commit '
faa1057d4c6cc3941e42d93399fa9cf511c09370':
Remove DRLCertFactory
Alan Viverette [Mon, 3 Feb 2014 23:32:10 +0000 (15:32 -0800)]
am
c8577b38: Merge "Revert "Cache display lists for Drawables""
* commit '
c8577b384a0e0e04eed6d05660e013b5db47b7f2':
Revert "Cache display lists for Drawables"
Alan Viverette [Mon, 3 Feb 2014 23:32:07 +0000 (15:32 -0800)]
am
fe0ea8c2: Merge "Allow specification of View theme override as a theme attribute"
* commit '
fe0ea8c21fe6f6cbaa0594295ec371efca4af824':
Allow specification of View theme override as a theme attribute
Alan Viverette [Mon, 3 Feb 2014 23:32:04 +0000 (15:32 -0800)]
am
14a11eee: Merge "Simplify GradientDrawable\'s use of ColorStateList"
* commit '
14a11eeeff3efd5458754785a7c48bbcf68122ef':
Simplify GradientDrawable's use of ColorStateList
John Spurlock [Mon, 3 Feb 2014 23:32:01 +0000 (15:32 -0800)]
am
17b79985: am
47e276db: am
cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev
* commit '
17b79985f4e5e6b696320e29f665adb796a2aef5':
Update READ&WRITE_DREAM_STATE to signature|system.
Craig Mautner [Mon, 3 Feb 2014 23:31:57 +0000 (15:31 -0800)]
am
624e98f5: am
d5f1fcb7: am
56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev
* commit '
624e98f53962377f00104a50d9fc8e3044cbcd79':
Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
Alan Viverette [Mon, 3 Feb 2014 23:31:54 +0000 (15:31 -0800)]
am
8b725dcb: Merge "Improve encapsulation of Resources"
* commit '
8b725dcbe15761514eea680c119bcc83a290c0f0':
Improve encapsulation of Resources
Chris Wren [Mon, 3 Feb 2014 23:31:50 +0000 (15:31 -0800)]
am
5c57c44e: Merge "record the notification style"
* commit '
5c57c44eea02ec579dc24cedfe417d487ba71fce':
record the notification style
Chris Craik [Mon, 3 Feb 2014 23:31:47 +0000 (15:31 -0800)]
am
494db9e4: Merge "Simplify umbra calculation"
* commit '
494db9e4bbf206025336aee9dfece93639686e44':
Simplify umbra calculation
Chris Craik [Mon, 3 Feb 2014 23:31:44 +0000 (15:31 -0800)]
am
1d89563f: Merge "Add initial hidden outline APIs"
* commit '
1d89563ff8f5afd77457ef58489a234f490b480c':
Add initial hidden outline APIs
Narayan Kamath [Mon, 3 Feb 2014 23:31:40 +0000 (15:31 -0800)]
am
90b8eaa6: am
797b5adc: am
77a1986c: am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
90b8eaa68bda6beaf2ff886c3ed642e7050e3ff6':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Mon, 3 Feb 2014 23:31:38 +0000 (15:31 -0800)]
am
8396b56e: am
d49babe5: (-s ours) am
9af95574: am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
8396b56e0a12d97c7933afca3813c356c18a8f38':
Change ResourceType cookies to int32_t.
Narayan Kamath [Mon, 3 Feb 2014 23:31:35 +0000 (15:31 -0800)]
am
fd6a44d0: am
ff62e966: am
149510e0: am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
fd6a44d0b5b6bcfc606abf23520b316c4bf36fc4':
Fixed cancel() not working correctly
Igor Murashkin [Mon, 3 Feb 2014 23:31:32 +0000 (15:31 -0800)]
am
5ec133b9: am
ed5d7a6f: am
4463a4ef: am
e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
* commit '
5ec133b9a0949cda92c5c287169aba86ad615065':
EGL14.eglCreateWindowSurface should set producerControlledByApp
George Mount [Mon, 3 Feb 2014 23:31:28 +0000 (15:31 -0800)]
am
56f57ccb: Revert "Add Path trimming."
* commit '
56f57ccbd4fbbf4d572cc966d1cb76d7ae7ad334':
Revert "Add Path trimming."
Zhijun He [Mon, 3 Feb 2014 23:31:23 +0000 (15:31 -0800)]
am
10586ad2: am
4f840dd1: am
5901ddeb: am
0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
* commit '
10586ad2a6996b8f9f84ed47a65ccc2d883fc19f':
Narayan Kamath [Mon, 3 Feb 2014 23:31:19 +0000 (15:31 -0800)]
am
b9fd12ac: am
dfd1aa43: resolved conflicts for merge of
2cd0563c to klp-modular-dev-plus-aosp
* commit '
b9fd12ac53a35800753d54c4c0a825c261267c29':
Narayan Kamath [Mon, 3 Feb 2014 23:31:14 +0000 (15:31 -0800)]
am
3a5e4705: am
5cdbac1e: (-s ours) am
70986e19: am
ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
3a5e470553a1a42647850b7c642f96961c2e4587':
Narayan Kamath [Mon, 3 Feb 2014 23:31:10 +0000 (15:31 -0800)]
am
13701e48: am
133c9649: am
fa2e16e3: am
54190ec8: Merge "change Surface constructor arg to 64bit"
* commit '
13701e4822d15e67bca1919ea1317312908f0bea':
Evan Charlton [Mon, 3 Feb 2014 22:58:21 +0000 (14:58 -0800)]
resolved conflicts for merge
54b100ce
Nick Kralevich [Mon, 3 Feb 2014 22:09:59 +0000 (14:09 -0800)]
am
cb6979ac: am
643be3ba: am
3dfa15c4: am
db3278ab: Merge "Map SELinux log levels to Android log levels."
* commit '
cb6979acf9794a30ede4b888a078b728c913bb16':
Narayan Kamath [Mon, 3 Feb 2014 22:09:54 +0000 (14:09 -0800)]
am
acda9614: Merge "Change ResourceType cookies to int32_t."
* commit '
acda961446f52b555d9c38757a68b5b15d26fd0b':
Change ResourceType cookies to int32_t.
Zhijun He [Mon, 3 Feb 2014 22:09:45 +0000 (14:09 -0800)]
am
5901ddeb: am
0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
* commit '
5901ddeb525ed7691c382e8d17f47055d7d1e5db':
Release locked buffer when it fails to acquire graphics buffer
Zhijun He [Mon, 3 Feb 2014 21:10:19 +0000 (21:10 +0000)]
Merge "Camera2: Update sceneFlicker tag spec"
Zhijun He [Mon, 3 Feb 2014 21:09:06 +0000 (13:09 -0800)]
Camera2: Update sceneFlicker tag spec
Change-Id: Ieb083b653b83f0373661fc15895ce23a4342a47f
Zhijun He [Mon, 3 Feb 2014 20:41:43 +0000 (20:41 +0000)]
Merge "Camera2: update lens state tag specs"
Zhijun He [Mon, 3 Feb 2014 20:39:53 +0000 (12:39 -0800)]
Camera2: update lens state tag specs
Change-Id: I630d45945f2806bde748f440c8203e08a70f59c9
Christopher Tate [Mon, 3 Feb 2014 20:35:01 +0000 (20:35 +0000)]
Merge "Introduce "IdleService" API to expose idle-time maintenance to apps"
Zhijun He [Mon, 3 Feb 2014 20:26:36 +0000 (20:26 +0000)]
Merge "Camera2: Update pixelArraySize and analog sensitivity tags"
Zhijun He [Mon, 3 Feb 2014 20:25:12 +0000 (12:25 -0800)]
Camera2: Update pixelArraySize and analog sensitivity tags
Change-Id: I07424afb44c70b5bcd600f1265efa969fdeac7e5
Geoff Mendal [Mon, 3 Feb 2014 19:08:19 +0000 (19:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 3 Feb 2014 18:51:48 +0000 (10:51 -0800)]
Import translations. DO NOT MERGE
Change-Id: I60c659282be6607e7510b5acfec18128ddbea404
Auto-generated-cl: translation import
Brian Carlstrom [Mon, 3 Feb 2014 18:11:48 +0000 (10:11 -0800)]
Merge commit '
2cd0563c' into mm
John Spurlock [Mon, 3 Feb 2014 17:36:11 +0000 (17:36 +0000)]
am
be878d87: am
b6a4926c: am
647db9fa: am
76ecd66a: am
0196e561: Fix typo in ImageView.java
* commit '
be878d8773cc841e5e144a6332c576c650e88126':
Fix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 17:27:11 +0000 (17:27 +0000)]
am
b6a4926c: am
647db9fa: am
76ecd66a: am
0196e561: Fix typo in ImageView.java
* commit '
b6a4926c670244fbf7d7033f2a1b46da25b35d39':
Fix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 17:24:05 +0000 (17:24 +0000)]
am
647db9fa: am
76ecd66a: am
0196e561: Fix typo in ImageView.java
* commit '
647db9fae37b36d99ce290acfae7b453f00ae5af':
Fix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 17:21:25 +0000 (17:21 +0000)]
am
76ecd66a: am
0196e561: Fix typo in ImageView.java
* commit '
76ecd66a6d5f8ceaebbe9cd109948f01aff4cd27':
Fix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 17:18:37 +0000 (17:18 +0000)]
am
0196e561: Fix typo in ImageView.java
* commit '
0196e561f280e6cc361442036da277a630e68558':
Fix typo in ImageView.java
John Spurlock [Mon, 3 Feb 2014 14:00:35 +0000 (09:00 -0500)]
Fix typo in ImageView.java
Change-Id: Iaa7b020f09c893a5fe006a8523686dd8b9a8f872
Alan Viverette [Sat, 1 Feb 2014 09:43:16 +0000 (01:43 -0800)]
Fix broken build in BridgeResources
Change-Id: Iec58a2acda6b9538bcb5974d3d5c45ea6e53eac5
Christopher Tate [Mon, 19 Aug 2013 23:14:25 +0000 (16:14 -0700)]
Introduce "IdleService" API to expose idle-time maintenance to apps
When an application wishes to do low-priority background work when the
device is otherwise idle (e.g. in a desk dock overnight), it declares
a service in its manifest that requires this permission:
android:permission="android.permission.BIND_IDLE_SERVICE
to launch, and which publishes this intent filter:
<intent-filter>
<action android:name="android.service.idle.IdleService" />
</intent-filter>
This string is declared in the API as IdleService.SERVICE_INTERFACE.
The service must be implemented by extending the new "IdleService"
class, which provides the API through which the system will communicate
with the app.
IdleService declares three methods, two of which are lifecycle callbacks
to the service, and the third of which is for the service itself to
invoke when appropriate. The lifecycle callbacks are
public abstract boolean onIdleStart();
public abstract void onIdleStop();
The first of these is a notification to the service that an idle
maintenance interval has begun. The service can then spin off
whatever non-UI work it wishes. When the interval is over, or if
the OS determines that idle services should be shut down immediately,
the onIdleStop() method will be invoked. The service must shut down
any background processing immediately when this method is called.
Both of these methods must return immediately. However, the OS
holds a wakelock on the application's behalf for the entire period
between the onIdleStart() and onIdleStop() callbacks. This means
that for system-arbitrated idle-time operation, the application does
not need to do any of its own wakelock management, and does not need
to hold any wakelock permissions.
The third method in IdleService is
public final void finishIdle();
Calling this method notifies the OS that the application has finished
whatever idle-time operation it needed to perform, and the OS is thus
free to release the wakelock and return to normal operation (or to
allow other apps to run their own idle services).
Currently the idle window granted to each idle service is ten minutes.
The OS is rather conservative about when these services are run; low
battery or any user activity will suppress them, and the OS will not
choose to run them particularly often.
Idle services are granted their execution windows in round-robin
fashion.
Bug
9680213
Change-Id: Idd6f35940c938c31b94aa4269a67870abf7125b6
Narayan Kamath [Fri, 31 Jan 2014 23:12:34 +0000 (15:12 -0800)]
am
70986e19: (-s ours) am
ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
70986e197bbaf4de4f8126519a75df2b057c3b52':
AArch64: Use of long for pointers in PropertyValuesHolder
Kenny Root [Fri, 31 Jan 2014 23:07:24 +0000 (23:07 +0000)]
am
aa6ff54e: am
85ee57d1: am
c064a1b5: Merge "Remove DRLCertFactory"
* commit '
aa6ff54ef57936024e98d9f565afe9fff24df2e4':
Remove DRLCertFactory
Kenny Root [Fri, 31 Jan 2014 23:01:15 +0000 (23:01 +0000)]
am
85ee57d1: am
c064a1b5: Merge "Remove DRLCertFactory"
* commit '
85ee57d1ae73db6ac014d76d7be1b5d5e87eb89f':
Remove DRLCertFactory
Kenny Root [Fri, 31 Jan 2014 22:58:53 +0000 (14:58 -0800)]
am
c064a1b5: Merge "Remove DRLCertFactory"
* commit '
c064a1b5d9a68bb5513e6ed64a067ab822e98764':
Remove DRLCertFactory
Kenny Root [Fri, 31 Jan 2014 22:54:44 +0000 (22:54 +0000)]
Merge "Remove DRLCertFactory"
Kenny Root [Fri, 31 Jan 2014 22:10:01 +0000 (14:10 -0800)]
Remove DRLCertFactory
No longer needed since Conscrypt is the main provider.
Change-Id: Iee741ef376af2de52db79df07e96057438778bc6
Narayan Kamath [Fri, 31 Jan 2014 22:05:33 +0000 (14:05 -0800)]
am
fa2e16e3: am
54190ec8: Merge "change Surface constructor arg to 64bit"
* commit '
fa2e16e36d95d5cf0848a28a98ac4566321fc119':
change Surface constructor arg to 64bit
Evan Charlton [Fri, 31 Jan 2014 21:58:46 +0000 (13:58 -0800)]
resolved conflicts for merge of
cb7cdd50 to master-nova
Change-Id: Idf4f4b41ddfd15a0e6e45cf3a45f57fa39e82708
Alan Viverette [Fri, 31 Jan 2014 21:07:51 +0000 (21:07 +0000)]
Merge "Revert "Cache display lists for Drawables""
Alan Viverette [Fri, 31 Jan 2014 21:05:23 +0000 (21:05 +0000)]
Merge "Allow specification of View theme override as a theme attribute"
Alan Viverette [Fri, 31 Jan 2014 21:04:38 +0000 (13:04 -0800)]
Revert "Cache display lists for Drawables"
This reverts commit
c062c7003f34999632fe4ad721dcd47cd71b2159.
Change-Id: I96d4f0482b927101f52140b667f4c38ffc8687f5
Alan Viverette [Fri, 31 Jan 2014 21:01:01 +0000 (21:01 +0000)]
Merge "Simplify GradientDrawable's use of ColorStateList"
Alan Viverette [Fri, 31 Jan 2014 20:58:43 +0000 (12:58 -0800)]
Simplify GradientDrawable's use of ColorStateList
BUG:
12816352
Change-Id: Icff432ee5d460ca733866185b8bf61fd50248cfc
John Spurlock [Fri, 31 Jan 2014 20:25:40 +0000 (20:25 +0000)]
am
47e276db: am
cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev
* commit '
47e276db2a938ca4ff9767cba28062b892e81629':
Update READ&WRITE_DREAM_STATE to signature|system.
John Spurlock [Fri, 31 Jan 2014 20:19:41 +0000 (20:19 +0000)]
am
cbd156c1: Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev
* commit '
cbd156c1d574dfe5eced42ec640989ab7de7d5e7':
Update READ&WRITE_DREAM_STATE to signature|system.
John Spurlock [Fri, 31 Jan 2014 20:17:48 +0000 (20:17 +0000)]
Merge "Update READ&WRITE_DREAM_STATE to signature|system." into klp-modular-dev
Craig Mautner [Fri, 31 Jan 2014 19:32:18 +0000 (19:32 +0000)]
am
d5f1fcb7: am
56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev
* commit '
d5f1fcb7a4d6cc11b727bdf79fab7693a5dd7117':
Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
Craig Mautner [Fri, 31 Jan 2014 19:26:17 +0000 (19:26 +0000)]
am
56bf2f67: Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev
* commit '
56bf2f670c800f569fc72102e79fd555b6102677':
Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
Craig Mautner [Fri, 31 Jan 2014 19:23:35 +0000 (19:23 +0000)]
Merge "Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage" into klp-modular-dev
Alan Viverette [Fri, 31 Jan 2014 19:22:24 +0000 (19:22 +0000)]
Merge "Improve encapsulation of Resources"
Craig Mautner [Sat, 25 Jan 2014 02:02:10 +0000 (18:02 -0800)]
Clarify FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET usage
Fixes bug
12592453.
Change-Id: Ib64559727d59b3433c3753f9fda88329effc7e26
Chris Wren [Fri, 31 Jan 2014 19:19:23 +0000 (19:19 +0000)]
Merge "record the notification style"
Alan Viverette [Fri, 31 Jan 2014 19:07:29 +0000 (11:07 -0800)]
Improve encapsulation of Resources
Change-Id: Ic408915d2695ac8906231da1d2dc127f94bdd0cc
John Spurlock [Fri, 31 Jan 2014 19:14:19 +0000 (14:14 -0500)]
Update READ&WRITE_DREAM_STATE to signature|system.
Change-Id: Ic3c4c5445384712571e7a1188ed9e2ab6ceb4bde
Chris Craik [Fri, 31 Jan 2014 18:57:24 +0000 (18:57 +0000)]
Merge "Simplify umbra calculation"
Chris Craik [Fri, 31 Jan 2014 18:56:40 +0000 (18:56 +0000)]
Merge "Add initial hidden outline APIs"
Chris Craik [Thu, 30 Jan 2014 23:43:56 +0000 (15:43 -0800)]
Simplify umbra calculation
Reuse pre-computed values
Change-Id: Ia7725be0ec3ac58af477fcb8de375f5faa05abf4
Chris Wren [Wed, 5 Jun 2013 19:05:57 +0000 (15:05 -0400)]
record the notification style
Bug:
10634902
Change-Id: I7d29f252367f4ab58e97a6ac8b0c6702f558e5cf
Narayan Kamath [Fri, 31 Jan 2014 17:12:42 +0000 (17:12 +0000)]
am
797b5adc: am
77a1986c: am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
797b5adcb4ead3c687db3d9fd831dff93760dd4a':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Fri, 31 Jan 2014 17:12:38 +0000 (17:12 +0000)]
am
d49babe5: (-s ours) am
9af95574: am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
d49babe50d61e0264a9f4fbf0b4e182cc56635db':
Change ResourceType cookies to int32_t.
Nick Kralevich [Fri, 31 Jan 2014 16:46:03 +0000 (08:46 -0800)]
am
3dfa15c4: am
db3278ab: Merge "Map SELinux log levels to Android log levels."
* commit '
3dfa15c49b4c78cdf3bf1af79e9b307596455708':
Map SELinux log levels to Android log levels.
Narayan Kamath [Fri, 31 Jan 2014 16:41:42 +0000 (16:41 +0000)]
am
ff62e966: am
149510e0: am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
ff62e966b60bb20dc7c3384485816b1e7bf06057':
Fixed cancel() not working correctly
Igor Murashkin [Fri, 31 Jan 2014 16:41:38 +0000 (16:41 +0000)]
am
ed5d7a6f: am
4463a4ef: am
e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
* commit '
ed5d7a6f147c75c8af73328bdf816707b58afd90':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Narayan Kamath [Fri, 31 Jan 2014 16:29:23 +0000 (16:29 +0000)]
am
77a1986c: am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
77a1986c69760583f05eabbf7dac7c25dd8b7e7b':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Fri, 31 Jan 2014 16:29:19 +0000 (16:29 +0000)]
am
9af95574: am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
9af955744d4e0d82b61fc99a932b9a5cf28b5df7':
Change ResourceType cookies to int32_t.
Narayan Kamath [Fri, 31 Jan 2014 16:29:16 +0000 (16:29 +0000)]
am
149510e0: am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
149510e010b46a445355a8d7fcdb8401125b92c3':
Fixed cancel() not working correctly
Igor Murashkin [Fri, 31 Jan 2014 16:29:06 +0000 (16:29 +0000)]
am
4463a4ef: am
e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
* commit '
4463a4ef26b2eb62fae74568193fd07e97dedd4d':
EGL14.eglCreateWindowSurface should set producerControlledByApp
George Mount [Fri, 31 Jan 2014 00:56:09 +0000 (00:56 +0000)]
Revert "Add Path trimming."
Bug
12489442
This reverts commit
7fe03a267e6edb65142444765ce29ad5ff126052.
Change-Id: Idf434d79683e170364838388c7933a8591f7f4d3
Narayan Kamath [Fri, 31 Jan 2014 15:30:21 +0000 (07:30 -0800)]
am
49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
* commit '
49b7ba4dbc0b4984fc466bb98e9cfa40650db85b':
AArch64: Make AssetManager and related classes 64-bit compatible
Narayan Kamath [Fri, 31 Jan 2014 15:30:18 +0000 (07:30 -0800)]
am
1cadc07d: Merge "Change ResourceType cookies to int32_t."
* commit '
1cadc07dd1e3711fb1e57548038e3026682c5ef8':
Change ResourceType cookies to int32_t.
Narayan Kamath [Fri, 31 Jan 2014 15:30:15 +0000 (07:30 -0800)]
am
b9f960e0: Merge "Fixed cancel() not working correctly"
* commit '
b9f960e094d53440be5c7e8759a74dbb0ab57317':
Fixed cancel() not working correctly
Igor Murashkin [Fri, 31 Jan 2014 15:30:12 +0000 (07:30 -0800)]
am
e05b7b50: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
* commit '
e05b7b50e234e8ed2471f5ad96bb3d715067e9f3':
EGL14.eglCreateWindowSurface should set producerControlledByApp
Zhijun He [Fri, 31 Jan 2014 15:12:38 +0000 (15:12 +0000)]
am
4f840dd1: am
5901ddeb: am
0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
* commit '
4f840dd16db41a2d4442667193d57260f84af04a':
Release locked buffer when it fails to acquire graphics buffer
Narayan Kamath [Fri, 31 Jan 2014 15:12:34 +0000 (15:12 +0000)]
am
dfd1aa43: resolved conflicts for merge of
2cd0563c to klp-modular-dev-plus-aosp
* commit '
dfd1aa4331b8ab452d7baf4fdf8cf0cd36c67ddd':
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Narayan Kamath [Fri, 31 Jan 2014 15:12:30 +0000 (15:12 +0000)]
am
5cdbac1e: (-s ours) am
70986e19: am
ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
5cdbac1e44aa85ccfedd19eb1a7376fe84b1ca72':
AArch64: Use of long for pointers in PropertyValuesHolder
Narayan Kamath [Fri, 31 Jan 2014 15:06:21 +0000 (15:06 +0000)]
am
133c9649: am
fa2e16e3: am
54190ec8: Merge "change Surface constructor arg to 64bit"
* commit '
133c9649c3c83e6ccefa4f46c162ddb3f55269d0':
change Surface constructor arg to 64bit
Narayan Kamath [Fri, 31 Jan 2014 15:06:17 +0000 (15:06 +0000)]
am
98ac6c79: resolved conflicts for merge of
cb7cdd50 to klp-modular-dev-plus-aosp
* commit '
98ac6c79a430e62a886b3a8278694425b5906300':
Fix a few more delegate methods in layoutlib.
Nick Kralevich [Fri, 31 Jan 2014 15:06:11 +0000 (15:06 +0000)]
am
643be3ba: am
3dfa15c4: am
db3278ab: Merge "Map SELinux log levels to Android log levels."
* commit '
643be3bab19a6305e776721854b293928bf2bfaa':
Map SELinux log levels to Android log levels.
Narayan Kamath [Fri, 31 Jan 2014 14:35:13 +0000 (14:35 +0000)]
Merge "AArch64: Make AssetManager and related classes 64-bit compatible"
Ashok Bhat [Fri, 17 Jan 2014 16:02:38 +0000 (16:02 +0000)]
AArch64: Make AssetManager and related classes 64-bit compatible
Following changes have been done:
[x] Long is used to store native pointers as pointers can be
64-bit.
[x] AssetManager openAsset native function returned -1 if
file name was empty and java function considered any
non-zero value as success. This has been fixed by native
function throwing Illegal Argument Exception as well.
[x] AssetManager incRefsLocked and decRefsLocked now accept
long as input to support 64-bit native references.
[x] AssetManager incRefsLocked method incorrecly used
'this.hashCode()' instead of the passed parameter id.
This has been fixed.
[x] 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: I095b9f900d49e51f43ad6afc47cbc23116a6a64a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Narayan Kamath [Fri, 31 Jan 2014 14:13:47 +0000 (14:13 +0000)]
Merge "Change ResourceType cookies to int32_t."
Narayan Kamath [Mon, 27 Jan 2014 17:32:37 +0000 (17:32 +0000)]
Change ResourceType cookies to int32_t.
Also change the order of parameters in ResTable constructors
to avoid ambiguity.
(cherry picked from commit
00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1)
Change-Id: I874c5d03c134dc3c331fba423b5280366296287c