drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
180,454 Commits 1 Branch 0 Tags
Commit Graph

180454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
2ae0733982 Remove DisplayListLogBuffer 
Change-Id: I001832fc444b6d532f4a382e0a31cc1d8956dbd8
 2015-01-21 14:22:39 -08:00
Chris Craik
8076b5a8df Merge "Simplify and correct texture upload unpack alignment parameter" 2015-01-20 22:39:07 +00:00
Chris Craik
37424b3d55 Simplify and correct texture upload unpack alignment parameter 
bug:18928352
Change-Id: I484dd225ef495394d5e4283345387647345c2a07
 2015-01-20 14:15:51 -08:00
ztenghui
a0d17f8090 Merge "Update the javadoc for the clip path fix." 2015-01-20 22:08:46 +00:00
Chris Banes
025ac537fd Merge "Fix NPE in ActionMenuView when there isn't a presenter" 2015-01-20 22:08:33 +00:00
Ying Wang
c643dda221 am 43df3c6c: am b5108949: am e4a031e3: Merge "New trick to install bad dex file." 
* commit '43df3c6c198da1c2a6622e50fca86b656385baf1':
  New trick to install bad dex file.
 2015-01-20 22:07:43 +00:00
Adam Lesinski
43a88535df am d9bd0886: am aee7225e: Merge "Process base APK" into lmp-mr1-dev automerge: 554a6f5 
* commit 'd9bd08864eaf9d8847d974eadb81806b9e086a2d':
  Process base APK
 2015-01-20 22:03:16 +00:00
Ying Wang
43df3c6c19 am b5108949: am e4a031e3: Merge "New trick to install bad dex file." 
* commit 'b51089499c8c39fce47deccf70d3ea069c58b471':
  New trick to install bad dex file.
 2015-01-20 22:01:26 +00:00
Adam Lesinski
d9bd08864e am aee7225e: Merge "Process base APK" into lmp-mr1-dev 
automerge: 554a6f5

* commit '554a6f5278ec05077d8252249afc911897fbfe76':
  Process base APK
 2015-01-20 21:55:12 +00:00
Ying Wang
b51089499c am e4a031e3: Merge "New trick to install bad dex file." 
* commit 'e4a031e3c3b234ff91ce62e95b788eca7e00082c':
  New trick to install bad dex file.
 2015-01-20 21:50:14 +00:00
Christopher Tate
0fa1d70ab1 am a9c122af: Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev automerge: 7651dcb automerge: 5afc62c 
* commit 'a9c122af60621597f1d008c8a283074309383aac':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:49:55 +00:00
Adam Lesinski
554a6f5278 am aee7225e: Merge "Process base APK" into lmp-mr1-dev 
* commit 'aee7225e34376a90e8c25e5df53604085cc1b712':
  Process base APK
 2015-01-20 21:48:03 +00:00
Christopher Tate
a9c122af60 Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev automerge: 7651dcb 
automerge: 5afc62c

* commit '5afc62cd39403c12a253101b12c52f440843bdaf':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:45:08 +00:00
Ying Wang
e4a031e3c3 Merge "New trick to install bad dex file." 2015-01-20 21:43:52 +00:00
Adam Lesinski
aee7225e34 Merge "Process base APK" into lmp-mr1-dev 2015-01-20 21:41:46 +00:00
Christopher Tate
5afc62cd39 Merge "Don\'t write widget metadata to backup unless it\'s new/changed" into lmp-mr1-dev 
automerge: 7651dcb

* commit '7651dcb92193a5a970a2554e067ec14d6fcad802':
  Don't write widget metadata to backup unless it's new/changed
 2015-01-20 21:26:56 +00:00
Christopher Tate
7651dcb921 Merge "Don't write widget metadata to backup unless it's new/changed" into lmp-mr1-dev 2015-01-20 21:24:00 +00:00
Wale Ogunwale
885e727ab4 am f5f54dd6: am 92dd1abe: Update restored task uid to match the package uid on current device. automerge: 7fd985f 
* commit 'f5f54dd69122bc07ea0a25b8d98b9048cbe4582f':
  Update restored task uid to match the package uid on current device.
 2015-01-20 21:17:05 +00:00
Wale Ogunwale
f5f54dd691 am 92dd1abe: Update restored task uid to match the package uid on current device. 
automerge: 7fd985f

* commit '7fd985f2c69f600f7530311ac9b7c9af196dc0e0':
  Update restored task uid to match the package uid on current device.
 2015-01-20 21:10:01 +00:00
Wale Ogunwale
7fd985f2c6 am 92dd1abe: Update restored task uid to match the package uid on current device. 
* commit '92dd1abef4c0a22db40c5f7bbd100e6b471a1ad3':
  Update restored task uid to match the package uid on current device.
 2015-01-20 20:58:26 +00:00
John Reck
d720ec1d04 Merge "Move Canvas" 2015-01-20 20:54:09 +00:00
Wale Ogunwale
92dd1abef4 Update restored task uid to match the package uid on current device. 
The uid on the task we are restoring from another device are
meaningless on the current device. Change updates the uid of any
task we restore to match the package uid on the current device.

Bug: 19014377
Change-Id: I285fbe9f509cae3d2e9a212a59e88f34b4db20e5
 2015-01-20 12:52:07 -08:00
John Reck
849911a9c4 Move Canvas 
Change-Id: I83d557af30fc2d5c69d06eedc0f4d52ac41c4210
 2015-01-20 12:39:05 -08:00
Ying Wang
b643624d2f New trick to install bad dex file. 
Previously we use LOCAL_JAVA_RESOURCE_FILES to override the normally
generated classes.dex with a bad dex file.
Now as we have moved Java resource processing before running jarjar, dx
would fail for the bad classes.dex inside the classes.jar.
Instead we override the target specific variable PRIVATE_DEX_FILE to
inject the bad dex file.

(cherry-picked from commit f122d90c290c789e0d0085127beebdcf1935c127)

Bug: 18837479
Change-Id: I73f82c8a15e1d8935d9c2f290ba9456184a56ec7
 2015-01-20 12:15:17 -08:00
Ying Wang
63ae9f3309 Merge "New trick to install bad dex file." 2015-01-20 19:39:43 +00:00
Todd Kennedy
e50c298cc2 Merge "Don't read float from parcel" 2015-01-20 19:26:45 +00:00
Todd Kennedy
e1f183d01b Merge "Expose new binder call createStackOnDisplay()" 2015-01-20 19:17:01 +00:00
Todd Kennedy
e635f66842 Don't read float from parcel 
We were reading a float from a parcel, but, never writing the float. Also
opportunistically fix a couple warnings where we were using raw classes
instead of their templatized version.

Bug: 19001243
Change-Id: I6e2a72795cf12bfaf880f2f46c1d91b207aa327c
 2015-01-20 11:12:52 -08:00
Ricardo Cervera
5b0d4881e7 am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c automerge: 046dc08 
automerge: 115759a

* commit '115759a3894eeede288fa1a7e5c3a09879bfe777':
 2015-01-20 19:10:41 +00:00
Ricardo Cervera
115759a389 am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c 
automerge: 046dc08

* commit '046dc08962fcf0ea32597859c3ef80afea0d4069':
 2015-01-20 19:07:11 +00:00
Todd Kennedy
4900bf9d82 Expose new binder call createStackOnDisplay() 
Creates a new, empty ActivityStack on a display. Use the binder call to
launch an activity on said stack.

Bug: 19001243
Change-Id: I0f04e8f2703bcc706f58e75333869fb35f6b1ee9
 2015-01-20 10:51:49 -08:00
Ricardo Cervera
046dc08962 am 7c002d75: am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 automerge: 47e274c 
* commit '7c002d75b62585c3598a4a5a93647a3323e90b8d':
 2015-01-20 18:38:40 +00:00
Ricardo Cervera
7c002d75b6 am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 automerge: 458f432 
automerge: 47e274c

* commit '47e274c56a0662e3e2aef24f2a458cc078e70fd8':
 2015-01-20 18:32:22 +00:00
Ricardo Cervera
47e274c56a am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 automerge: eada048 
automerge: 458f432

* commit '458f4326bdff638cefe175b179a487872cf678c1':
 2015-01-20 18:10:49 +00:00
Ricardo Cervera
458f4326bd am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 automerge: e8f6bd4 
automerge: eada048

* commit 'eada048addc14a95ced54b17c6a75f5f899e2c2a':
 2015-01-20 18:03:50 +00:00
Ricardo Cervera
eada048add am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256 
automerge: e8f6bd4

* commit 'e8f6bd484627e16fa2fd9509b0f06056ee44be94':
  docs: Added info on noHistory and onActivityResult(). Bug: 13807256
 2015-01-20 17:57:45 +00:00
Neil Fuller
df8e59abe5 am 77e7f401: am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build." 
* commit '77e7f401161e778e7f06401ac72b132f5272d4e2':
  Fix for broken docs build.
 2015-01-20 15:35:50 +00:00
Neil Fuller
77e7f40116 am aa3a45ba: am 42c2ac00: Merge "Fix for broken docs build." 
* commit 'aa3a45ba5bc78ab4015a1d2c4c361d3f54118d8e':
  Fix for broken docs build.
 2015-01-20 15:29:55 +00:00
Neil Fuller
aa3a45ba5b am 42c2ac00: Merge "Fix for broken docs build." 
* commit '42c2ac00e6e6e8fcfd15dcfbc6d70eabc709d904':
  Fix for broken docs build.
 2015-01-20 15:24:35 +00:00
Neil Fuller
42c2ac00e6 Merge "Fix for broken docs build." 2015-01-20 15:18:59 +00:00
Neil Fuller
ae69120b0f Fix for broken docs build. 
Broken by commit 50a01d89606b40dd151ad407d05c3b2867bbdbad

Change-Id: Iab460aa6254d320349f67e747f763bbf06d3e9e7
 2015-01-20 15:17:04 +00:00
Neil Fuller
4c7ddabefa am 7014da74: resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp 
* commit '7014da74e861f8cfc34fcbd528b4c83a1dc97503':
  Changes associated with an OkHttp upgrade
 2015-01-20 13:29:31 +00:00
Neil Fuller
7014da74e8 resolved conflicts for merge of 7382c02d to lmp-mr1-dev-plus-aosp 
Change-Id: Idfa2750230aa56e7ae34fcc33d62558df942abd0
 2015-01-20 13:21:58 +00:00
Neil Fuller
7382c02d62 am 00502e89: Merge "Changes associated with an OkHttp upgrade" 
* commit '00502e89603fa460cfd29d8759d74e38946105d4':
  Changes associated with an OkHttp upgrade
 2015-01-20 12:56:34 +00:00
Neil Fuller
00502e8960 Merge "Changes associated with an OkHttp upgrade" 2015-01-20 12:50:48 +00:00
Neil Fuller
50a01d8960 Changes associated with an OkHttp upgrade 
Change-Id: I2a4db602aa7ffdef886e0f1a955715a2551a87a5
 2015-01-20 11:59:24 +00:00
Geoff Mendal
1480108d05 Merge "Import translations. DO NOT MERGE" 2015-01-19 18:45:46 +00:00
Geoff Mendal
6b5eedfdcd Import translations. DO NOT MERGE 
Change-Id: I495a71dc523687a3484aaf570c2efbc2a7801a6a
Auto-generated-cl: translation import
 2015-01-19 12:43:05 -06:00
Sudheer Shanka
c7321134b3 Merge "Update dpm command to follow --user convention." 2015-01-19 18:41:33 +00:00
Narayan Kamath
d6fe549b50 am 66bbfb6b: am 17f50f81: am d8beca64: Merge "Remove support for --classpath and make --runtime-init the default." 
* commit '66bbfb6b2ccedecba3cbd0843b5a9ae498c68c82':
  Remove support for --classpath and make --runtime-init the default.
 2015-01-19 15:24:02 +00:00