Commit Graph

15649 Commits

Author SHA1 Message Date
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
52066faf5e am 32ff33bd: am 59db26c5: Merge "Build and store android_system.jar." into lmp-dev
* commit '32ff33bde38b631d6e70353efd2f859acc66a584':
  Build and store android_system.jar.
2014-07-16 16:46:10 +00: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
b26e5f7990 am 5838efd7: (-s ours) am 0d519132: (DO NOT MERGE) Fix SampleSpellCheckerService settings
* commit '5838efd75363a071a1957863e55a60ec117eae93':
  (DO NOT MERGE) Fix SampleSpellCheckerService settings
2014-07-15 03:50:14 +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
2786a4a09b am a1344f79: am a8e31235: Add the arm64 pstate register to the stack tool.
* commit 'a1344f7939cb3da6018d87ad758f5329c9c3bf7e':
  Add the arm64 pstate register to the stack tool.
2014-07-15 02:35:56 +00:00
Elliott Hughes
e4360aed0e am 5283a536: am fbc66057: am 535decd2: Merge "Add the arm64 pstate register to the stack tool."
* commit '5283a53663c559dd4efd077be09a5c2c737353e0':
  Add the arm64 pstate register to the stack tool.
2014-07-15 02:32:03 +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
Elliott Hughes
5283a53663 am fbc66057: am 535decd2: Merge "Add the arm64 pstate register to the stack tool."
* commit 'fbc66057941a16a75c0a61afd64fab4cddd4e1a0':
  Add the arm64 pstate register to the stack tool.
2014-07-15 02:27:55 +00:00
Elliott Hughes
a8e31235e9 Add the arm64 pstate register to the stack tool.
Also take into account the fact that the arm pcsr register is the
fifth entry on its line, so the stack tool previously stripped that
off.

(cherry picked from commit be4de46d09)

Change-Id: I0a937ae1a36071c3aaa5d955f56ee034dfdfe7de
2014-07-14 19:01:02 -07:00
Elliott Hughes
fbc6605794 am 535decd2: Merge "Add the arm64 pstate register to the stack tool."
* commit '535decd2bc4c94713d006ccfdfb0aa8fe28c8662':
  Add the arm64 pstate register to the stack tool.
2014-07-15 01:54:13 +00:00
Elliott Hughes
535decd2bc Merge "Add the arm64 pstate register to the stack tool." 2014-07-14 23:57:35 +00:00
Elliott Hughes
be4de46d09 Add the arm64 pstate register to the stack tool.
Also take into account the fact that the arm pcsr register is the
fifth entry on its line, so the stack tool previously stripped that
off.

Change-Id: I1dd2d11060e572b4d8ffd8710cf1df4d970671e4
2014-07-14 17:16:30 -07:00
Jae Seo
ed47e4c0f1 am ca1c55b3: AtscInput: Add a dummy implementation of abstract onSetCaptionEnabled()
* commit 'ca1c55b353482602c56bfe74caa56cd126d709e1':
  AtscInput: Add a dummy implementation of abstract onSetCaptionEnabled()
2014-07-14 19:12:35 +00:00
Chet Haase
a141244adb am dcabc1ac: Merge "Add RecyclerView animations for change actions"
* commit 'dcabc1acaedb3e7c3d8c9049d4f573ae1fe2efe3':
  Add RecyclerView animations for change actions
2014-07-14 19:12:33 +00:00
Ying Wang
458970dd0c am 4391853b: Fix win_sdk build.
* commit '4391853b56b7fb749d2bb959151d92bd9e241b6c':
  Fix win_sdk build.
2014-07-14 19:12:32 +00:00
Andrew Hsieh
57a4cd15c8 am d163bd84: am 5d8817f5: am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
* commit 'd163bd845cf67692bc31ccbe36a90608667df8f3':
2014-07-14 19:12:30 +00:00
Andrew Hsieh
d6de917533 am d749247c: am 70aad066: am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
* commit 'd749247c986cb3901fc9cecfd479b14ec67414a8':
2014-07-14 19:12:28 +00:00
Andrew Hsieh
cebae74855 am f52b8c34: am 3eb82eca: am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
* commit 'f52b8c34694ed37f87f371b3be311f81d4752925':
2014-07-14 19:12:27 +00:00
Leon Scroggins III
858d16f221 am c7095947: Call setShader after setLocalMatrix.
* commit 'c7095947cbae1f55ef04a2357957b323e8b1ee64':
  Call setShader after setLocalMatrix.
2014-07-14 19:12:25 +00:00
Deepanshu Gupta
d38e53e9f3 am ba188a67: am 2c353e75: (-s ours) Update platform SDK component to L
* commit 'ba188a67c30528e93868c901fc712cf104ee9295':
  Update platform SDK component to L
2014-07-14 19:12:24 +00:00
Elliott Hughes
fd12270bfd am ae207056: am 95f5ef2a: am e72af215: am 8de48e23: Merge "Fix testrunner\'s reference to icu4c."
* commit 'ae207056954da27a113662faf1c29e0e1408f5ee':
2014-07-14 19:12:22 +00:00
Tony Wickham
8dd30e6488 am 86d72d3c: am 39ae7d22: am 542963ee: Merge "Added _index.html and screenshots to all samples." into klp-modular-dev
* commit '86d72d3c921c2a683faed987eb5f518b24d801d1':
  Added _index.html and screenshots to all samples.
2014-07-14 19:12:20 +00:00
Deepanshu Gupta
8788379a42 am 52ec473f: am 9dabcc8d: (-s ours) am fc3efcd2: am d6ce63a3: am 6bd8a043: am fdafffee: (-s ours) am af01e43f: am 4564b18a: am 64d3ef3b: (-s ours) am e61fde7f: am bbfcdcc4: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit '52ec473f569b3baee8c618a8cf405a78c94c9c3e':
2014-07-14 19:12:19 +00:00
Deepanshu Gupta
176fbffdaa am a3b0eda9: am 3eb60fc3: (-s ours) am e851bb15: am bc4103e3: am 17bed4f4: am 63527665: (-s ours) am 8a0254ee: am 618ccb2b: am 22779216: (-s ours) am 95ad5e38: am 36b22516: Package renamed fonts. [DO NOT MERGE]
* commit 'a3b0eda91733aea66af6ac1600b59cafa4b54ff1':
  Package renamed fonts. [DO NOT MERGE]
2014-07-14 19:12:18 +00:00
Deepanshu Gupta
45b4fa1b10 am 6bfaf060: am b79abe56: (-s ours) am 6721a877: am 6aaa1ebb: am 2f5a06e4: am 1066b887: (-s ours) am 7ad693d1: am 35feaff4: Package renamed fonts. [DO NOT MERGE]
* commit '6bfaf060034e7f61e2c5142b210387836ef475f5':
  Package renamed fonts. [DO NOT MERGE]
2014-07-14 19:12:17 +00:00
Dmitriy Ivanov
3f5034e0a5 am ba1f98e1: am 7a6c4e92: am 95c0db1e: am ce3b58a6: Merge "Update dlext.h header"
* commit 'ba1f98e1df9cf778045880d5d0d3f4c54b6d7412':
2014-07-14 19:12:15 +00:00
Chris Banes
0a09c0ccdf am 170658dd: Update Support7Demos to include Palette demos
* commit '170658dd6956c78520fd0628c569f9bda46c34fa':
  Update Support7Demos to include Palette demos
2014-07-14 19:12:14 +00:00
Andrew Hsieh
21a0ffb486 am a29134d4: am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
* commit 'a29134d40477fbf1a9b07855555a44ca1b01dac9':
2014-07-14 19:12:13 +00:00
Andrew Hsieh
280f11d80a am 693fa5d8: am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
* commit '693fa5d8977ccef97bdbc9a91dc63750ac3d3186':
2014-07-14 19:12:12 +00:00
Andrew Hsieh
861a7ab907 am 45ac4eec: am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
* commit '45ac4eec03d8a4cdac9aa1e12085d9d5bc16ee69':
2014-07-14 19:12:10 +00:00
Pierre Vandwalle
0af7fe78c1 Merge "DevTools - add support for WifiScanner and Passpoint" 2014-07-14 18:38:02 +00:00
Jae Seo
db670d867c am ed47e4c0: am ca1c55b3: AtscInput: Add a dummy implementation of abstract onSetCaptionEnabled()
* commit 'ed47e4c0f1ab2f95f6c23a9527ae59cae26ebc53':
2014-07-14 20:07:08 +00:00
Chet Haase
845a2e2425 am a141244a: am dcabc1ac: Merge "Add RecyclerView animations for change actions"
* commit 'a141244adb5c073b2ca8c795428156f1597aff79':
2014-07-14 20:07:07 +00:00
Ying Wang
95c6331dc7 am 458970dd: am 4391853b: Fix win_sdk build.
* commit '458970dd0c55217c1acea584fef6b4c1b22471bb':
2014-07-14 20:07:06 +00:00
Andrew Hsieh
69013c7ef2 am 57a4cd15: am d163bd84: am 5d8817f5: am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
* commit '57a4cd15c8b73c4b1e95eea159217152b840e53f':
2014-07-14 20:07:05 +00:00
Andrew Hsieh
efc145c3db am d6de9175: am d749247c: am 70aad066: am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
* commit 'd6de917533aaa63530484228cb0f6d0a078dd19d':
2014-07-14 20:07:03 +00:00
Andrew Hsieh
3356a80d65 am cebae748: am f52b8c34: am 3eb82eca: am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
* commit 'cebae748557cd3cd9e0a9d9d841eb3706032b707':
2014-07-14 20:07:02 +00:00
Leon Scroggins III
888dfb2ec1 am 858d16f2: am c7095947: Call setShader after setLocalMatrix.
* commit '858d16f2218b4bff58c4b0611ebfbfd95a64a78c':
2014-07-14 20:07:01 +00:00