LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,178 Commits 2 Branches 0 Tags
486a53c0167005ca34e7c54e09ad63d095515080
Commit Graph

15178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
a20f555a25 am f5838d24: am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit 'f5838d2491807833ca963b98d5aed802d9c5d128':
 2014-07-18 22:05:35 +00:00
Deepanshu Gupta
1b0b90c5b3 am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit '385f3bb6c4dfd2e630b64c6afdde69507eef5d8c':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-18 22:05:34 +00:00
Deepanshu Gupta
2533746207 am ab4bad87: am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit 'ab4bad872a7a03e3ab4164252942fa227ca4f1cc':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-18 22:02:32 +00:00
Deepanshu Gupta
6458c80c00 resolved conflicts for merge of 3baef70c to jb-mr1-dev 
Change-Id: I93a460f4ba7c9e2d8e417c53061072773f9ef9fd
 2014-07-18 15:00:58 -07:00
Deepanshu Gupta
f5838d2491 am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit 'f26c608bf020a0ab93d549d7e483930fe1e7b00f':
 2014-07-18 22:00:39 +00:00
Deepanshu Gupta
ab4bad872a am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit '8a4e0831b1144b9d809306c56a0bd387342dcb15':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-18 21:57:46 +00:00
Deepanshu Gupta
385f3bb6c4 am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit 'c5a8318a78f40087ae564753fa57167cbb12af46':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-18 21:57:08 +00:00
Deepanshu Gupta
f26c608bf0 am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit '197b278f1cb1b55a15c8e2100faf42313989352c':
 2014-07-18 21:56:55 +00:00
Deepanshu Gupta
c5a8318a78 am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit '5837c832955cfe06cec00d8c1daf2c7effc50b0f':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-18 21:53:26 +00:00
Deepanshu Gupta
197b278f1c am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit '716666beaa0d8411781eebc89dc53a38155ca3dc':
 2014-07-18 21:52:56 +00:00
Deepanshu Gupta
8a4e0831b1 am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit 'e377c65b608b096b438b3d4edf71351bf481593a':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-18 21:52:54 +00:00
Deepanshu Gupta
716666beaa am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit 'a9078f4a2b29713e3759c2cbdba8ebe3db0639c4':
 2014-07-18 21:47:01 +00:00
Deepanshu Gupta
e377c65b60 am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit 'd4402051282b976a1bd40000a61e1bed996c6ea9':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-18 21:45:21 +00:00
Deepanshu Gupta
5837c83295 am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit 'a6da0ee8ca5b1b5ce0a9a4cbd576bcfb5d477516':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-18 21:45:21 +00:00
Deepanshu Gupta
3baef70ca5 am 95da2621: Update platform SDK component to revision 5. [DO NOT MERGE] 
* commit '95da262195c8cc13c20d4b0bd70c87ae49046cf1':
  Update platform SDK component to revision 5. [DO NOT MERGE]
 2014-07-18 21:43:46 +00:00
Deepanshu Gupta
a9078f4a2b am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit '7ee92e43446fe4f9c5f30e997afabe443719bca1':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-18 21:42:35 +00:00
Deepanshu Gupta
a6131422fd am 82b828e1: Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev 
* commit '82b828e178eef7b0da6325f4f2cb39c0b5b68cef':
  Update platform SDK component to revision 2. [DO NOT MERGE]
 2014-07-18 21:40:08 +00:00
Deepanshu Gupta
a6da0ee8ca am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit '7ee92e43446fe4f9c5f30e997afabe443719bca1':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-18 21:39:30 +00:00
Deepanshu Gupta
d440205128 am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit '7f724995d9c4140f6432de4c9bdda8716d8e6059':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-18 21:39:27 +00:00
Sungsoo Lim
51324e22d1 Merge "Remove the dummy implementation of onContentUnblocked()" into lmp-dev 2014-07-17 22:03:23 +00:00
Baligh Uddin
dbd7a9fbdf Remove deprecated locales - DO NOT MERGE 
Change-Id: If073e059cb3161240952fafde16878c502c69341
 2014-07-19 13:04:57 -07:00
Sungsoo Lim
e88684d024 Remove the dummy implementation of onContentUnblocked() 
This reverts commit 3b0abb7811.

Change-Id: I784cdd5ce0fe78ba66ed5e8cb8135b9082b4aa1c
 2014-07-19 04:52:42 +00:00
Deepanshu Gupta
7f295eefbe am 8d6dee77: am 9605eaa7: am fddc192f: am 7b9c13b5: am 292e62aa: am babc7880: am 38e59046: am dd0fcf2f: am 9f1005fd: am 84e3386e: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs 
* commit '8d6dee775951bf77f0b635bb3a551e02a208e1a4':
 2014-07-19 00:42:10 +00:00
Deepanshu Gupta
8b8fca4898 am db204c79: am 626baa07: am 1dcb4f05: am ae75543c: am 54c50b59: am d67beb9a: am dbea3d7d: am 53e1237a: am 8ae03adc: am 5fff297a: am e2ee1baf: resolved conflicts for merge of 6458c80c to jb-mr1.1-docs 
* commit 'db204c7992edcac02a4a8770bfcb0b906f6543e4':
  Update platform SDK component to revision 5. [DO NOT MERGE]
 2014-07-19 00:42:03 +00:00
Deepanshu Gupta
3b929a7a1a am 2aad5082: (-s ours) am 2cdeb60c: am a2c022fa: am 5b6f4fc6: am a20f555a: (-s ours) am f5838d24: am f26c608b: am 197b278f: (-s ours) am 716666be: am a9078f4a: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit '2aad5082c408725de95afc593d4287ea516a9ee6':
 2014-07-19 00:41:55 +00:00
Deepanshu Gupta
884d4cb440 am d898a214: (-s ours) am 591f5c8b: am 1fa56bef: am 3271adb9: am 1b0b90c5: (-s ours) am 385f3bb6: am c5a8318a: am 5837c832: (-s ours) am a6da0ee8: am 7ee92e43: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit 'd898a214c0b9e48e3be2556b2ddd08d05e4a6678':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-19 00:41:54 +00:00
Deepanshu Gupta
e731ac39a7 am 6b014b79: (-s ours) am 25337462: am ab4bad87: am 8a4e0831: am e377c65b: (-s ours) am d4402051: am 7f724995: Update platform SDK component to revision 3. [DO NOT MERGE] 
* commit '6b014b79664989356b68e44e39662eb5f457b3aa':
  Update platform SDK component to revision 3. [DO NOT MERGE]
 2014-07-19 00:41:45 +00:00
Deepanshu Gupta
3b9da34f27 am a6131422: (-s ours) am 82b828e1: Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev 
* commit 'a6131422fd68ccfced1a055c8e1d84e3cb500710':
  Update platform SDK component to revision 2. [DO NOT MERGE]
 2014-07-19 00:41:27 +00:00
Chris Craik
644678f99b Update Outline API 
Change-Id: Ia9a4ce9e50473f4c1ee46fe40506c6a9736043a7
 2014-07-18 15:26:29 -07:00
Youngsang Cho
3ee98b1ad0 Merge "AtscTvInput : Add a dummy implementation of abstract onContentUnblocked()" into lmp-dev 2014-07-18 18:24:25 +00:00
Jaewan Kim
3b0abb7811 AtscTvInput : Add a dummy implementation of abstract onContentUnblocked() 
Bug: 13172379
Change-Id: I0c165632bf842ec0d7ea54cc4eecc0cd305ad602
 2014-07-18 02:24:23 +00:00
Chulwoo Lee
9f688cc161 Merge "Put input ID when inserting channels" into lmp-dev 2014-07-17 22:03:23 +00:00
Chulwoo Lee
f96eb6672e Put input ID when inserting channels 
Change-Id: I1c9944db6fd9d05cfbbfffe2e3464b6f16b7445b
 2014-07-18 18:27:30 +09:00
Wonsik Kim
859cc5f0e6 Merge "Adjust to onCreateSession() method signature change" into lmp-dev 2014-07-17 22:03:23 +00:00
Wonsik Kim
e7713aa686 Adjust to onCreateSession() method signature change 
Change-Id: I6137f2d85eb2ca18fb3e50bac54f048470145cd5
 2014-07-18 13:10:02 +09:00
Ying Wang
90b2bdae91 Merge "3rd attempt to build and store android_system.jar in sdk builds." into lmp-dev 2014-07-17 21:58:28 +00:00
Ying Wang
567a46bf22 3rd attempt to build and store android_system.jar in sdk builds. 
Change-Id: Ica053e3ef6e3190ab4dcc32b3b7d06fc4c619884
 2014-07-18 09:16:40 -07:00
Deepanshu Gupta
82b828e178 Merge "Update platform SDK component to revision 2. [DO NOT MERGE]" into klp-modular-dev 2014-07-17 21:09:48 +00: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
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
Jae Seo
c9bdea0489 AtscTvInput: Switch to the new buildInputId/buildChannelsUriForXXX API 
Change-Id: Ibe757445aa087f2bedd2c645981ec99cce1dc8c4
 2014-07-17 20:43:23 -07: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
Ying Wang
59db26c5d2 Merge "Build and store android_system.jar." into lmp-dev 2014-07-16 16:25:13 +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
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
Jae Seo
ca1c55b353 AtscInput: Add a dummy implementation of abstract onSetCaptionEnabled() 
Change-Id: I9e65cb2a2f6da8ce4ed32c9c2ffb2c6523425f4b
 2014-07-12 20:38:17 -07:00