OSDN Git Service
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
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
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
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
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
Narayan Kamath [Fri, 31 Jan 2014 13:20:58 +0000 (13:20 +0000)]
Merge "Fixed cancel() not working correctly"
Zhijun He [Fri, 31 Jan 2014 13:00:35 +0000 (13:00 +0000)]
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
Narayan Kamath [Fri, 31 Jan 2014 12:57:24 +0000 (12:57 +0000)]
resolved conflicts for merge of
2cd0563c to klp-modular-dev-plus-aosp
Change-Id: Ia28df1c1aa084959ed9289bfe90e7f6a4bffb8a2
Narayan Kamath [Fri, 31 Jan 2014 12:17:09 +0000 (12:17 +0000)]
am
70986e19: am
ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
70986e197bbaf4de4f8126519a75df2b057c3b52':
AArch64: Use of long for pointers in PropertyValuesHolder
Narayan Kamath [Fri, 31 Jan 2014 12:17:05 +0000 (12:17 +0000)]
am
fa2e16e3: am
54190ec8: Merge "change Surface constructor arg to 64bit"
* commit '
fa2e16e36d95d5cf0848a28a98ac4566321fc119':
change Surface constructor arg to 64bit
Narayan Kamath [Fri, 31 Jan 2014 12:08:17 +0000 (12:08 +0000)]
resolved conflicts for merge of
cb7cdd50 to klp-modular-dev-plus-aosp
Change-Id: I2fc48fb4bd779042fc9bc00e6c8aca876d4a5f0b
Nick Kralevich [Fri, 31 Jan 2014 10:26:32 +0000 (10:26 +0000)]
am
3dfa15c4: am
db3278ab: Merge "Map SELinux log levels to Android log levels."
* commit '
3dfa15c49b4c78cdf3bf1af79e9b307596455708':
Map SELinux log levels to Android log levels.
Igor Murashkin [Fri, 31 Jan 2014 01:26:14 +0000 (01:26 +0000)]
Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp"
Scott Main [Thu, 30 Jan 2014 23:25:08 +0000 (23:25 +0000)]
am
40a7e3c4: am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
40a7e3c425120661c305999f7c2bdd76d3240b7d':
Revert "add Cast to the sidenav"
Scott Main [Thu, 30 Jan 2014 23:25:02 +0000 (23:25 +0000)]
am
04022e50: am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
04022e50774c02ff0a7757c5464486af021fd108':
Revert "add google cast feature page"
Quddus Chong [Thu, 30 Jan 2014 23:24:54 +0000 (23:24 +0000)]
am
bcf8faa6: am
f29e2589: am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
bcf8faa6c79bde5b9580057238e447165ac9d329':
Revert "docs: Added API reference docs for GCore Iberico release."
Zhijun He [Thu, 30 Jan 2014 23:03:30 +0000 (15:03 -0800)]
am
0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
* commit '
0a1b64fe79f41eec5cebe8434ab30d93e2ea2724':
Release locked buffer when it fails to acquire graphics buffer
Zhijun He [Thu, 30 Jan 2014 23:01:20 +0000 (23:01 +0000)]
Merge "Release locked buffer when it fails to acquire graphics buffer"
Hui Lu [Thu, 30 Jan 2014 22:58:48 +0000 (22:58 +0000)]
Merge "Add proxy as another network." into klp-modular-dev
Hui Lu [Wed, 15 Jan 2014 16:05:36 +0000 (11:05 -0500)]
Add proxy as another network.
Change-Id: I70cb6ac5604c4f0d6a752a291c40de2445ae98bb
Brian Carlstrom [Thu, 30 Jan 2014 22:11:02 +0000 (14:11 -0800)]
am
3038046b: Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
3038046b23540ccf4ca80f181386a77cf64d5e27':
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Scott Main [Thu, 30 Jan 2014 22:10:50 +0000 (22:10 +0000)]
am
e71cc6fd: am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
e71cc6fd82df1bf654d72e796ac7975dbf0aff29':
Revert "add Cast to the sidenav"
Scott Main [Thu, 30 Jan 2014 22:10:45 +0000 (22:10 +0000)]
am
4b1a317a: am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
4b1a317abb56dc90efacf86ccd796643b1f02478':
Revert "add google cast feature page"
Scott Main [Thu, 30 Jan 2014 21:52:15 +0000 (21:52 +0000)]
am
897739f1: Merge "Revert "add Cast to the sidenav"" into klp-docs
* commit '
897739f1b7d179cd402fcf907e2ac9751fe44c6d':
Revert "add Cast to the sidenav"
Scott Main [Thu, 30 Jan 2014 21:52:11 +0000 (21:52 +0000)]
am
428ccea5: Merge "Revert "add google cast feature page"" into klp-docs
* commit '
428ccea5090d3a88d6af898cd90b52df4062101f':
Revert "add google cast feature page"
Brian Carlstrom [Thu, 30 Jan 2014 21:50:57 +0000 (21:50 +0000)]
Merge "frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default"
Scott Main [Thu, 30 Jan 2014 21:27:25 +0000 (21:27 +0000)]
Merge "Revert "add Cast to the sidenav"" into klp-docs
Scott Main [Thu, 30 Jan 2014 21:27:06 +0000 (21:27 +0000)]
Revert "add Cast to the sidenav"
This reverts commit
3781318fefba28699e7713b231c9591bf29eadac.
Change-Id: Iacefcd9a9d1f678d7a16f2bcdaac4c6cc90a475d
Scott Main [Thu, 30 Jan 2014 21:24:45 +0000 (21:24 +0000)]
Merge "Revert "add google cast feature page"" into klp-docs
Scott Main [Thu, 30 Jan 2014 21:24:25 +0000 (21:24 +0000)]
Revert "add google cast feature page"
This reverts commit
cf010ab9c5df8896c57a722137ac3b4306ef1ca5.
Change-Id: I87197ce3c4f65ae8899bbf081cb4c0e84e4f1684
Brian Carlstrom [Thu, 30 Jan 2014 21:14:01 +0000 (13:14 -0800)]
frameworks/base: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
Change-Id: Ibb7ed86867e4dca53ad7fe33326b08e6f5e664c4
Quddus Chong [Thu, 30 Jan 2014 19:36:07 +0000 (19:36 +0000)]
am
f29e2589: am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
f29e2589a440e73d9dea1a6c9c7aed1c5a3002f2':
Revert "docs: Added API reference docs for GCore Iberico release."
Quddus Chong [Thu, 30 Jan 2014 19:33:24 +0000 (19:33 +0000)]
am
583e0b2c: Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
* commit '
583e0b2c0e1011406342a0801045a893b75880ca':
Revert "docs: Added API reference docs for GCore Iberico release."
Quddus Chong [Thu, 30 Jan 2014 19:31:05 +0000 (19:31 +0000)]
Merge "Revert "docs: Added API reference docs for GCore Iberico release."" into klp-docs
Quddus Chong [Thu, 30 Jan 2014 19:03:16 +0000 (19:03 +0000)]
Revert "docs: Added API reference docs for GCore Iberico release."
This reverts commit
32993c68fff5cb229c8503ffe0fad06b53189377.
Change-Id: I8eab48ae260a3289ae0d4c0a131d80a1fd1a5316
Scott Main [Thu, 30 Jan 2014 18:12:46 +0000 (18:12 +0000)]
am
500db2fe: am
55330921: am
8b6fa56f: am
c1ae12b7: update android studio download to 0.4.2
* commit '
500db2fed926e50f6fdb60ccb010724143960dd9':
update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 18:09:16 +0000 (18:09 +0000)]
am
55330921: am
8b6fa56f: am
c1ae12b7: update android studio download to 0.4.2
* commit '
55330921c93f3ed6f277fed4d98a2133dd3ab47a':
update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 18:06:44 +0000 (18:06 +0000)]
am
8b6fa56f: am
c1ae12b7: update android studio download to 0.4.2
* commit '
8b6fa56f5cdb66ed1bafb7920ba8299ee8b3034a':
update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 18:03:05 +0000 (18:03 +0000)]
am
c1ae12b7: update android studio download to 0.4.2
* commit '
c1ae12b7d891ff3598d03f52a0e817876d7921e3':
update android studio download to 0.4.2
Scott Main [Thu, 30 Jan 2014 16:55:01 +0000 (08:55 -0800)]
update android studio download to 0.4.2
Change-Id: Icf789bb6a2cfb254b25e865e2a60ec4717887afa
Scott Main [Thu, 30 Jan 2014 16:51:09 +0000 (16:51 +0000)]
am
ec20f347: am
46cf9087: am
e49346dc: am
eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
* commit '
ec20f347e71f6ca35cd88b747a9b0ba2a81744cd':
Revert "add warning to all the new iberico API pages about SDK not available yet"
Scott Main [Thu, 30 Jan 2014 16:47:16 +0000 (16:47 +0000)]
am
599bb934: am
759c6305: am
0d9f5b64: am
e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
* commit '
599bb93400d719d2570f8d84bdbc63c9ed4f85d0':
Revert "add api notice to cast package index"
Scott Main [Thu, 30 Jan 2014 16:46:59 +0000 (16:46 +0000)]
am
46cf9087: am
e49346dc: am
eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
* commit '
46cf90878e49f15a94db28366da581e9f11c9a4c':
Revert "add warning to all the new iberico API pages about SDK not available yet"
Scott Main [Thu, 30 Jan 2014 16:43:13 +0000 (16:43 +0000)]
am
648729ad: am
540306be: am
eee01505: am
36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
* commit '
648729adb4c75199d6464c32cf9eb26cffacb680':
Revert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:43:07 +0000 (16:43 +0000)]
am
759c6305: am
0d9f5b64: am
e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
* commit '
759c6305b227fbb22a031b9ac561f8f23ca41a0f':
Revert "add api notice to cast package index"
Scott Main [Thu, 30 Jan 2014 16:42:44 +0000 (16:42 +0000)]
am
e49346dc: am
eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
* commit '
e49346dcb213cc96f910c798e4aa00688197af9a':
Revert "add warning to all the new iberico API pages about SDK not available yet"
Scott Main [Thu, 30 Jan 2014 16:38:54 +0000 (16:38 +0000)]
am
540306be: am
eee01505: am
36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
* commit '
540306be15f9d15a93ef05db870653d5a5e7bc38':
Revert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:38:46 +0000 (16:38 +0000)]
am
0d9f5b64: am
e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
* commit '
0d9f5b640c31a5bce699419a93a98acef1471db7':
Revert "add api notice to cast package index"
Scott Main [Thu, 30 Jan 2014 16:38:33 +0000 (16:38 +0000)]
am
eb35de00: Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
* commit '
eb35de00dec9444e0c46ac641a74d058be48d547':
Revert "add warning to all the new iberico API pages about SDK not available yet"
Scott Main [Thu, 30 Jan 2014 16:34:52 +0000 (16:34 +0000)]
am
eee01505: am
36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
* commit '
eee015057a2abfaef2ac7360a5536605e7d74e05':
Revert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:34:26 +0000 (16:34 +0000)]
Merge "Revert "add warning to all the new iberico API pages about SDK not available yet"" into klp-docs
Scott Main [Thu, 30 Jan 2014 16:34:26 +0000 (16:34 +0000)]
am
e627eaee: Merge "Revert "add api notice to cast package index"" into klp-docs
* commit '
e627eaeebe061e3fc586a78c8837d1b780d0741b':
Revert "add api notice to cast package index"
Scott Main [Thu, 30 Jan 2014 16:33:50 +0000 (16:33 +0000)]
Revert "add warning to all the new iberico API pages about SDK not available yet"
This reverts commit
e724990230d267c13f8f820b5fdbe7c58b25d344.
Change-Id: I1415bf9542b01b57b1802115466288ec93ab6987
Scott Main [Thu, 30 Jan 2014 16:31:44 +0000 (16:31 +0000)]
Merge "Revert "add api notice to cast package index"" into klp-docs
Scott Main [Thu, 30 Jan 2014 16:30:26 +0000 (16:30 +0000)]
am
36d7dfb7: Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
* commit '
36d7dfb7e816836dbc6039237cadd3382e10d5b2':
Revert "add api notice to a bunch more files in iberico release"
Scott Main [Thu, 30 Jan 2014 16:28:27 +0000 (16:28 +0000)]
Revert "add api notice to cast package index"
This reverts commit
845bcc6d344765a0ea7cfcf0b4ac398774d06f94.
Change-Id: I07b047f1b44e8b9b32bb4b36b6f858cdef9fed9e
Scott Main [Thu, 30 Jan 2014 16:26:21 +0000 (16:26 +0000)]
Merge "Revert "add api notice to a bunch more files in iberico release"" into klp-docs
Scott Main [Thu, 30 Jan 2014 16:25:38 +0000 (16:25 +0000)]
Revert "add api notice to a bunch more files in iberico release"
This reverts commit
c62223a04d15da4240129a9b05ad0be965f08ee4.
Change-Id: If3cee4062e2f48a3c1e365f025701e6d1de9c9d4
jl1990 [Wed, 7 Aug 2013 15:39:22 +0000 (17:39 +0200)]
Fixed cancel() not working correctly
The method handleMessage(Message msg) from mHandler variable was
not checking if the timer was cancelled, so
sendMessageDelayed(obtainMessage(MSG), delay) was keeping the
timer alive. The patch simply adds a boolean and checks if the
CountDownTimer was cancelled before calling
sendMessageDelayed(obtainMessage(MSG), delay)
bug: https://code.google.com/p/android/issues/detail?id=58668
Change-Id: Ic6bbb9d33a3616f8503db222513cc14ad2270cb8
Signed-off-by: jl1990 <jlcarrasco1990@gmail.com>
Narayan Kamath [Thu, 30 Jan 2014 10:39:21 +0000 (02:39 -0800)]
am
ab71f8b6: Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
* commit '
ab71f8b68fee0f2a4f2049c4345b5334948c9df9':
AArch64: Use of long for pointers in PropertyValuesHolder
Narayan Kamath [Thu, 30 Jan 2014 10:37:12 +0000 (10:37 +0000)]
Merge "AArch64: Use of long for pointers in PropertyValuesHolder"
Narayan Kamath [Thu, 30 Jan 2014 10:34:38 +0000 (02:34 -0800)]
am
54190ec8: Merge "change Surface constructor arg to 64bit"
* commit '
54190ec8307ebb83d02b7d9b8edc80a042792de6':
change Surface constructor arg to 64bit
Narayan Kamath [Thu, 30 Jan 2014 10:31:43 +0000 (10:31 +0000)]
Merge "change Surface constructor arg to 64bit"
Chong Zhang [Wed, 29 Jan 2014 20:52:15 +0000 (12:52 -0800)]
change Surface constructor arg to 64bit
Bug:
12799017
Bug:
12799384
(cherry picked from commit
af608e81d450b962a443a21fb1a6feadeb355fe1)
Change-Id: I8d1471b16e6a6d334a3a32b789045eb171b81e03
Narayan Kamath [Thu, 30 Jan 2014 09:37:41 +0000 (01:37 -0800)]
am
c65e0c95: Merge "Fix a few more delegate methods in layoutlib."
* commit '
c65e0c95c855de4505a320b6dcd66df5397c88d5':
Fix a few more delegate methods in layoutlib.
Narayan Kamath [Thu, 30 Jan 2014 09:13:17 +0000 (09:13 +0000)]
Merge "Fix a few more delegate methods in layoutlib."
Adam Koch [Wed, 29 Jan 2014 23:15:16 +0000 (23:15 +0000)]
am
af5b2d3f: am
6e1ce75f: am
b430d93b: am
cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
* commit '
af5b2d3f2308296a7dec93e4f790fb587cd86197':
Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659
Adam Koch [Wed, 29 Jan 2014 23:12:52 +0000 (23:12 +0000)]
am
6e1ce75f: am
b430d93b: am
cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
* commit '
6e1ce75f4c45e91cdc4442cc6c3d823017c7de4d':
Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659
Adam Koch [Wed, 29 Jan 2014 23:09:58 +0000 (23:09 +0000)]
am
b430d93b: am
cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
* commit '
b430d93b058a706be731e45f8c1836d97219a666':
Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659
Adam Koch [Wed, 29 Jan 2014 23:06:46 +0000 (23:06 +0000)]
am
cb3ea3d4: Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
* commit '
cb3ea3d47449a669e0d28131cf9254d5476bae73':
Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659
Adam Koch [Wed, 29 Jan 2014 23:04:02 +0000 (23:04 +0000)]
Merge "Doc fix: Update code snippet in displaying bitmaps training class Bug:
12715659" into klp-docs
Nick Kralevich [Wed, 29 Jan 2014 18:03:53 +0000 (10:03 -0800)]
am
db3278ab: Merge "Map SELinux log levels to Android log levels."
* commit '
db3278ab429860161e5baa26f141de95a48de0cb':
Map SELinux log levels to Android log levels.
Nick Kralevich [Wed, 29 Jan 2014 18:00:36 +0000 (18:00 +0000)]
Merge "Map SELinux log levels to Android log levels."
Stephen Smalley [Wed, 29 Jan 2014 17:55:58 +0000 (12:55 -0500)]
Map SELinux log levels to Android log levels.
Change-Id: I202c543ca6e4110c4011d1904eada4b75b59ff10
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
John Spurlock [Wed, 29 Jan 2014 15:49:20 +0000 (15:49 +0000)]
am
15c09e1e: am
0dbcd7d9: am
2d35ba4d: am
d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
* commit '
15c09e1e2f55fbca9ddafa4227ef30a6dbefa664':
[Navigation bar] Allow "right to left" gesture to launch search panel
John Spurlock [Wed, 29 Jan 2014 15:46:30 +0000 (15:46 +0000)]
am
0dbcd7d9: am
2d35ba4d: am
d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
* commit '
0dbcd7d99f37967f2ee7a8fad113df97b6a94fe7':
[Navigation bar] Allow "right to left" gesture to launch search panel
John Spurlock [Wed, 29 Jan 2014 15:42:34 +0000 (15:42 +0000)]
am
2d35ba4d: am
d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
* commit '
2d35ba4d4a43036706638ca0e96e5e1a9904d2af':
[Navigation bar] Allow "right to left" gesture to launch search panel
John Spurlock [Wed, 29 Jan 2014 15:40:00 +0000 (07:40 -0800)]
am
d12f4eb8: Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
* commit '
d12f4eb8cb986d710aaf98a9d6b8f66803d182d6':
[Navigation bar] Allow "right to left" gesture to launch search panel
Narayan Kamath [Wed, 29 Jan 2014 15:38:42 +0000 (15:38 +0000)]
am
d933edc7: am
9ecada44: am
dfd4f523: am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
d933edc742dcaf96862b211f4641e4cfd98acef5':
mNativeCanvas is long, not int.
John Spurlock [Wed, 29 Jan 2014 15:36:40 +0000 (15:36 +0000)]
Merge "[Navigation bar] Allow "right to left" gesture to launch search panel"
Narayan Kamath [Wed, 29 Jan 2014 15:33:48 +0000 (15:33 +0000)]
am
9ecada44: am
dfd4f523: am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
9ecada44042c49516d781281bbe0cba4e0af51a2':
mNativeCanvas is long, not int.
Narayan Kamath [Wed, 29 Jan 2014 15:29:23 +0000 (15:29 +0000)]
am
dfd4f523: am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
dfd4f5232c87c51fe639b594fd210b4073eca42b':
mNativeCanvas is long, not int.
Narayan Kamath [Wed, 29 Jan 2014 15:26:19 +0000 (07:26 -0800)]
am
d228a038: Merge "mNativeCanvas is long, not int."
* commit '
d228a03891f60520d517b2a3bc900b008b2da702':
mNativeCanvas is long, not int.
Narayan Kamath [Wed, 29 Jan 2014 15:05:03 +0000 (15:05 +0000)]
Fix a few more delegate methods in layoutlib.
Change-Id: Icd7069452b9ac66498af69ec705d12c3acd1c848
Narayan Kamath [Wed, 29 Jan 2014 15:02:05 +0000 (15:02 +0000)]
Merge "mNativeCanvas is long, not int."
Narayan Kamath [Wed, 29 Jan 2014 12:23:45 +0000 (12:23 +0000)]
am
c74f7619: am
cdc095ae: am
7be33110: am
d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
* commit '
c74f7619e19f4d172fc0bc6220abc917024c45b0':
AArch64: Use long for pointers in graphics/Interpolator
Narayan Kamath [Wed, 29 Jan 2014 12:23:40 +0000 (12:23 +0000)]
am
0cc4bb1f: am
e4fc5c17: am
74db9ddb: am
887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
* commit '
0cc4bb1ff30a7e2ef96837b1dbe79a89d5145dc2':
AArch64: Use long for pointers in SurfaceTexture
Narayan Kamath [Wed, 29 Jan 2014 12:21:32 +0000 (12:21 +0000)]
mNativeCanvas is long, not int.
swapNativeCanvas was asking for an int field.
Change-Id: I660fb13ecfb5d3b24201676dc03c16d61c92af07
Narayan Kamath [Wed, 29 Jan 2014 12:21:21 +0000 (12:21 +0000)]
am
cdc095ae: am
7be33110: am
d4ccffd3: Merge "AArch64: Use long for pointers in graphics/Interpolator"
* commit '
cdc095ae4850d9ffd08de0d6e8828949603fcdd1':
AArch64: Use long for pointers in graphics/Interpolator
Narayan Kamath [Wed, 29 Jan 2014 12:21:11 +0000 (12:21 +0000)]
am
e4fc5c17: am
74db9ddb: am
887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"
* commit '
e4fc5c17c092a77e0647e01e93a6b0e806c27692':
AArch64: Use long for pointers in SurfaceTexture