Commit Graph

15100 Commits

Author SHA1 Message Date
Ying Wang
572a5b7b20 am 38bf922a: Merge ""sdk" is not necessarily on the linux command line." into lmp-dev
* commit '38bf922ac10c400522514a2b7af1024ef413ebf9':
  "sdk" is not necessarily on the linux command line.
2014-07-18 11:40:39 +00:00
Jae Seo
689a6eb7d6 am c9bdea04: AtscTvInput: Switch to the new buildInputId/buildChannelsUriForXXX API
* commit 'c9bdea0489bbb9ff2b960a3638a07e6f213adf9d':
  AtscTvInput: Switch to the new buildInputId/buildChannelsUriForXXX API
2014-07-18 03:58:22 +00:00
Jae Seo
c9bdea0489 AtscTvInput: Switch to the new buildInputId/buildChannelsUriForXXX API
Change-Id: Ibe757445aa087f2bedd2c645981ec99cce1dc8c4
2014-07-17 20:43:23 -07:00
Yigit Boyar
f7c1c539ce am 850c44e0: Merge "Update divider item decorator to account for view translation" into lmp-dev
* commit '850c44e0ec6af4aeb88488729b53405be2fe6c73':
  Update divider item decorator to account for view translation
2014-07-18 02:51:19 +00:00
Jae Seo
66ef0f3c8a am d85449be: Quick build fix
* commit 'd85449be2418d23c36c984a4ebe3970f9f30208b':
  Quick build fix
2014-07-17 21:29:53 +00:00
Jae Seo
d85449be24 Quick build fix
Change-Id: I7b660363a53b77249c6ac94a78f25c70b449d0fc
2014-07-17 13:16:48 -07:00
Ying Wang
38bf922ac1 Merge ""sdk" is not necessarily on the linux command line." into lmp-dev 2014-07-17 17:59:02 +00:00
Ying Wang
c39b6ebb2f "sdk" is not necessarily on the linux command line.
Bug: 16208466
Change-Id: I29f8763e9763d2b482744d0c7a74c122a299d03b
2014-07-17 21:18:09 -07:00
Yigit Boyar
850c44e0ec Merge "Update divider item decorator to account for view translation" into lmp-dev 2014-07-17 17:59:02 +00:00
Yigit Boyar
cc33d7ec0f Update divider item decorator to account for view translation
Bug: 16241985
Change-Id: Id441a07fe547493007e9e05d1039bac526847a1c
2014-07-17 16:37:21 -07:00
Jim Miller
44f8eb157b am 94a862f0: Add new "pin complex" type to supported keyguard PINs
* commit '94a862f010399b46e38178e325f9e0da00c12ef8':
  Add new "pin complex" type to supported keyguard PINs
2014-07-17 17:01:37 +00:00
Andrew Hsieh
d54e91cf9b am a6b673cd: am 37feee2a: Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap"
* commit 'a6b673cd97ac0bdb28e041cff431167fc70e534d':
  Update mipsel and mips64el multilib lib* and lib-bootstrap
2014-07-17 12:59:55 +00:00
Andrew Hsieh
dee2e870e6 am 430b78ad: am 37351fdd: Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib"
* commit '430b78ad742811338c62394f74608322db6e7dec':
  Remove symlink ndk/platforms/android-L/arch-mips64/lib
2014-07-17 12:59:54 +00:00
Andrew Hsieh
6bdc96770e am 61aaedb2: am 488f2392: Merge "getSampletime -> getSampleTime"
* commit '61aaedb278afed833d19a51eeda23fa61e71d9f9':
  getSampletime -> getSampleTime
2014-07-17 12:59:53 +00:00
Andrew Hsieh
7086c5c4a7 am b240fe6d: am 2918193e: Merge "Media NDK files"
* commit 'b240fe6de0e2e61bb97a2569e583148b11e2d1d3':
  Media NDK files
2014-07-17 12:59:52 +00:00
Andrew Hsieh
7cde60b29e am 37b64790: am 8092009a: Merge "NDK media codec sample"
* commit '37b647901798727c01a9bbc5960060ec4880a47a':
  NDK media codec sample
2014-07-17 12:59:50 +00:00
Andrew Hsieh
61e5e463f5 am b74edf6b: am 6fdc2791: Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so"
* commit 'b74edf6b28ce6b852f0938f751f5b7331079e2eb':
  ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
2014-07-17 12:59:49 +00:00
Andrew Hsieh
2cd1f4cec3 am 2097b3b7: am 8839697e: Merge "Update OpenSLES_Android.h for API L"
* commit '2097b3b7e705753d7d5737f04cd133b941e79486':
  Update OpenSLES_Android.h for API L
2014-07-17 12:59:48 +00:00
Elliott Hughes
818b45f494 am 14a67c7e: am be5e8f72: Merge "Stack tool 32/64 bit compatibility fixes."
* commit '14a67c7e703553eaf722514f7e2e6eda48922819':
  Stack tool 32/64 bit compatibility fixes.
2014-07-17 12:59:04 +00:00
Andrew Hsieh
a6b673cd97 am 37feee2a: Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap"
* commit '37feee2abc4f975962fbfab4052834800669964e':
  Update mipsel and mips64el multilib lib* and lib-bootstrap
2014-07-17 12:30:41 +00:00
Andrew Hsieh
430b78ad74 am 37351fdd: Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib"
* commit '37351fdd10ba1f4aba08c6da661acb3188576fd2':
  Remove symlink ndk/platforms/android-L/arch-mips64/lib
2014-07-17 12:30:40 +00:00
Andrew Hsieh
61aaedb278 am 488f2392: Merge "getSampletime -> getSampleTime"
* commit '488f2392a55e426f63966f118bfbf46c3f850f35':
  getSampletime -> getSampleTime
2014-07-17 12:30:39 +00:00
Andrew Hsieh
b240fe6de0 am 2918193e: Merge "Media NDK files"
* commit '2918193e0b792e089a8373817f3f485a037eca2f':
  Media NDK files
2014-07-17 12:30:38 +00:00
Andrew Hsieh
37b6479017 am 8092009a: Merge "NDK media codec sample"
* commit '8092009a49c525f4fefd053cffac23cc665ba3ef':
  NDK media codec sample
2014-07-17 12:30:37 +00:00
Andrew Hsieh
b74edf6b28 am 6fdc2791: Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so"
* commit '6fdc2791028c283f2068fcc935fb7928374e19c1':
  ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
2014-07-17 12:30:36 +00:00
Andrew Hsieh
2097b3b7e7 am 8839697e: Merge "Update OpenSLES_Android.h for API L"
* commit '8839697e9cd8efb0c916fde9bbc292e552d21adf':
  Update OpenSLES_Android.h for API L
2014-07-17 12:30:35 +00:00
Andrew Hsieh
8092009a49 Merge "NDK media codec sample" 2014-07-17 04:16:20 +00:00
Marco Nelissen
ba5926ec3e NDK media codec sample
Change-Id: Id7e70cfccdace8bce253bdac4434c42f52ff72f3
2014-07-17 15:29:09 +08:00
Jesse Hall
22d95914d5 ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
Also update existing GLES2 and GLES3 headers to latest official
Khronos versions.

Bug: 15028495
Change-Id: Iecdc1d2cc23fbe10f225511536fb0bd46d11af4a
2014-07-17 15:20:39 +08:00
Glenn Kasten
5c939bfd32 Update OpenSLES_Android.h for API L
All other include/SLES/*.h are unchanged since API 14

Change-Id: If4be7449fc8866ee630dd7986d3ee0d6a48549d4
2014-07-17 15:13:15 +08:00
Andrew Hsieh
37feee2abc Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap" 2014-07-17 04:11:20 +00:00
Andrew Hsieh
d10a35fe44 Update mipsel and mips64el multilib lib* and lib-bootstrap
Needed by:
  https://android-review.googlesource.com/#/c/101410
  https://android-review.googlesource.com/#/c/101022

Change-Id: Ia5f96fa2ee91984cba12983c9fb01a6b2e584209
2014-07-17 16:24:51 +08:00
Andrew Hsieh
37351fdd10 Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib" 2014-07-17 04:11:20 +00:00
Andrew Hsieh
8b4f4331b7 Remove symlink ndk/platforms/android-L/arch-mips64/lib
This is for coming CL which replaces symlink lib with physical directory.
Somehow android-review.googlesource.com dislikes removal of
symlink and addition of physical directory appear in the same CL

Change-Id: I42a06761d940ef74859bf3bf8f6bb12667863a1e
2014-07-17 16:20:21 +08:00
Andrew Hsieh
488f2392a5 Merge "getSampletime -> getSampleTime" 2014-07-17 04:11:20 +00:00
Marco Nelissen
7a2be752cb getSampletime -> getSampleTime
Change-Id: I089adb8a4050fe72befe272318a903ef93744335
2014-07-17 15:31:43 +08:00
Marco Nelissen
cf8a4a67a5 Media NDK files
Change-Id: Ie41df1949abde194156ab188a662ec7065343d54
2014-07-17 15:31:04 +08:00
Andrew Hsieh
6fdc279102 Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so" 2014-07-17 04:11:20 +00:00
Andrew Hsieh
2918193e0b Merge "Media NDK files" 2014-07-17 04:07:19 +00:00
Andrew Hsieh
8839697e9c Merge "Update OpenSLES_Android.h for API L" 2014-07-17 04:07:19 +00:00
Elliott Hughes
14a67c7e70 am be5e8f72: Merge "Stack tool 32/64 bit compatibility fixes."
* commit 'be5e8f728a7daa64049a20a61a65d83570f2448d':
  Stack tool 32/64 bit compatibility fixes.
2014-07-17 00:21:02 +00:00
Jim Miller
94a862f010 Add new "pin complex" type to supported keyguard PINs
This adds a feature to allow DevicePolicyAdmins to prevent using
simple PINs, which are defined as those containing more than 3
repeated values. Examples include '1234', '2468', '1111', '9876', etc.

Bug 12081139

Change-Id: I4c7ae51730c23ad8050e6216a62a8038d9c645a6
2014-07-16 23:49:23 +00:00
Elliott Hughes
be5e8f728a Merge "Stack tool 32/64 bit compatibility fixes." 2014-07-16 23:44:46 +00:00
Brigid Smith
15142f793a Stack tool 32/64 bit compatibility fixes.
Left the default symbol.ARCH value intact and changed stack_core instead
so that it will assume the ABI is arm until it sees an ABI line.  This
allows compatibility for people who are used to pasting portions of a
tombstone instead of the whole thing (assuming said tombstone is arm)
while additionally supporting other architectures if a whole tombstone
  is pasted in.

Change-Id: Ib8b5754920d2e2aa5017c29daeca59abcf4b547d
2014-07-16 15:56:46 -07:00
Ying Wang
32ff33bde3 am 59db26c5: Merge "Build and store android_system.jar." into lmp-dev
* commit '59db26c5d2bf8c7fd99a6e2cbd287760c3da00cf':
  Build and store android_system.jar.
2014-07-16 16:42:33 +00:00
Ying Wang
59db26c5d2 Merge "Build and store android_system.jar." into lmp-dev 2014-07-16 16:25:13 +00:00
Tadashi G. Takaoka
5838efd753 am 0d519132: (DO NOT MERGE) Fix SampleSpellCheckerService settings
* commit '0d519132cb4df17f6c2b1fc8079f4202b8e3ba7a':
  (DO NOT MERGE) Fix SampleSpellCheckerService settings
2014-07-15 03:46:30 +00:00
Ying Wang
c41276ede6 Build and store android_system.jar.
Bug: 16208466
Change-Id: Ibc078339dff56233a9f8f11228f5299ef389f967
2014-07-14 20:39:54 -07:00
Tadashi G. Takaoka
0d519132cb (DO NOT MERGE) Fix SampleSpellCheckerService settings
Change-Id: Ifce72f3fe3153ef0086d4f47edb81faa475cc543
(cherry picked from commit 4efbb0254e)
2014-07-15 02:53:41 +00:00
Elliott Hughes
a1344f7939 am a8e31235: Add the arm64 pstate register to the stack tool.
* commit 'a8e31235e92258f9434682922ddca2b135c93bc4':
  Add the arm64 pstate register to the stack tool.
2014-07-15 02:32:02 +00:00