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

152404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Carlstrom
701663e381 am d1dc0394: am 6d3c8255: Merge "Remove obsolete pruneDexCache" 
* commit 'd1dc039438b33d58ad9973ed6fe6f2a5f593819d':
  Remove obsolete pruneDexCache
 2014-08-29 11:39:45 +00:00
Brian Carlstrom
bc9eb5d1b3 am c22e56dd: am 7d86375b: Merge "Change /dalvik-cache to be owned by root." 
* commit 'c22e56dd1209accaff898c02677ff7091fe4b973':
  Change /dalvik-cache to be owned by root.
 2014-08-29 11:39:21 +00:00
Dongwon Kang
1f36333ee2 am 9d5dadc9: am 2e585e88: Merge "TIF: update the default value documentation of Channels.COLUMN_BROWSABLE." into lmp-dev 
* commit '9d5dadc9317228156849dae14e0e75ca8d8950f9':
  TIF: update the default value documentation of Channels.COLUMN_BROWSABLE.
 2014-08-29 03:58:58 +00:00
Dianne Hackborn
84c043dace am 3452f1cf: am 1fee525a: Merge "Debug issue #17310019: pause when launching settings" into lmp-dev 
* commit '3452f1cf2d3451fbb5f69c0e0102f808354852b2':
  Debug issue #17310019: pause when launching settings
 2014-08-29 03:58:52 +00:00
Svetoslav
04e919ae6c am 2458c71c: am 8308a3cb: Merge "Fix app widget serices not being unbound." into lmp-dev 
* commit '2458c71c4774c8a1074f094d9e45bb2a41580219':
  Fix app widget serices not being unbound.
 2014-08-29 03:58:46 +00:00
Alex Light
cd91f11be5 am edcab233: am a2f18dc1: Remove obsolete pruneDexCache 
* commit 'edcab2336315f90b225c85d2d6d725ec79679b26':
  Remove obsolete pruneDexCache
 2014-08-29 03:58:41 +00:00
Alex Light
65793be1bf am 63a1740d: am 19f3d22f: Change /dalvik-cache to be owned by root. 
* commit '63a1740d4f3b195f7de67e021f75c253a5c3ca7e':
  Change /dalvik-cache to be owned by root.
 2014-08-29 03:58:34 +00:00
Dongwon Kang
ada47f476f am 8f50a388: am 6b9575be: Merge "TIF: cosmetic changes for consistency." into lmp-dev 
* commit '8f50a3888a62303cbdc683654c686223b8266bf4':
  TIF: cosmetic changes for consistency.
 2014-08-29 03:58:29 +00:00
RoboErik
1b6dc49e37 am 563efe4c: am 85f23210: Fix test build 
* commit '563efe4c598b5b0fb92c23343c90e68b3f76c01c':
  Fix test build
 2014-08-29 03:58:23 +00:00
Jeff Sharkey
2db944fa30 am f9dfbbf3: am f894a0d3: Merge "Teach API lint about package layering!" into lmp-dev 
* commit 'f9dfbbf3c0e2f12a8c712704e43f3dff66beb151':
  Teach API lint about package layering!
 2014-08-29 03:58:15 +00:00
George Mount
3a44b3f889 am f16343b7: am 2d53188b: Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 
* commit 'f16343b723656315cc51b9e3acb4c43d2263487e':
  Fix NPE when transitioning on unattached scene root.
 2014-08-29 03:12:00 +00:00
George Mount
c1cdf5dc3c am 202532da: am 48514832: Merge "Fix NPE when clicking "back" quickly." into lmp-dev 
* commit '202532dabd1ad1152721a192e6bb2587176a7d4c':
  Fix NPE when clicking "back" quickly.
 2014-08-29 03:11:54 +00:00
Dongwon Kang
cfe06fa3df am 2e585e88: Merge "TIF: update the default value documentation of Channels.COLUMN_BROWSABLE." into lmp-dev 
* commit '2e585e886e33cebd8c06a5f8678758a19c3cd9ab':
  TIF: update the default value documentation of Channels.COLUMN_BROWSABLE.
 2014-08-29 03:03:08 +00:00
Dianne Hackborn
0e4a15dbfb am 1fee525a: Merge "Debug issue #17310019: pause when launching settings" into lmp-dev 
* commit '1fee525a509a67adcf6b5a484f0072a72f340bad':
  Debug issue #17310019: pause when launching settings
 2014-08-29 03:03:03 +00:00
Svetoslav
fbf98e5f52 am 8308a3cb: Merge "Fix app widget serices not being unbound." into lmp-dev 
* commit '8308a3cb31c31b4587a91f02424ff0c1106bb1c0':
  Fix app widget serices not being unbound.
 2014-08-29 03:02:58 +00:00
Alex Light
8fc4f51add am a2f18dc1: Remove obsolete pruneDexCache 
* commit 'a2f18dc1a8d1aac9cf0a8cecb92f76b43a3c4e7e':
  Remove obsolete pruneDexCache
 2014-08-29 03:02:53 +00:00
Alex Light
f8c3fb9daf am 19f3d22f: Change /dalvik-cache to be owned by root. 
* commit '19f3d22f09fbaa1500d953b6e23e182c41d4c9da':
  Change /dalvik-cache to be owned by root.
 2014-08-29 03:02:49 +00:00
Dongwon Kang
20c6367810 am 6b9575be: Merge "TIF: cosmetic changes for consistency." into lmp-dev 
* commit '6b9575be3c52493041d28a929e1bf04e96233bac':
  TIF: cosmetic changes for consistency.
 2014-08-29 03:02:44 +00:00
RoboErik
9a0757db73 am 85f23210: Fix test build 
* commit '85f232102ec2a0554f9b431da3784bd75f1919a1':
  Fix test build
 2014-08-29 03:02:38 +00:00
Jeff Sharkey
a82c1cf5f5 am f894a0d3: Merge "Teach API lint about package layering!" into lmp-dev 
* commit 'f894a0d39112077e8f1e2ca67fa4be96d5ca4c79':
  Teach API lint about package layering!
 2014-08-29 03:02:30 +00:00
Brian Carlstrom
d1dc039438 am 6d3c8255: Merge "Remove obsolete pruneDexCache" 
* commit '6d3c8255ff41e5967f45d9fa0b0c677bbf3c34b5':
  Remove obsolete pruneDexCache
 2014-08-29 01:13:11 +00:00
Brian Carlstrom
c22e56dd12 am 7d86375b: Merge "Change /dalvik-cache to be owned by root." 
* commit '7d86375b1e02bff726911ed20070bc8e0553daaa':
  Change /dalvik-cache to be owned by root.
 2014-08-29 01:13:06 +00:00
Dongwon Kang
13d43b927f Merge "TIF: update the default value documentation of Channels.COLUMN_BROWSABLE." into lmp-dev 2014-08-29 01:08:50 +00:00
Dianne Hackborn
3d07395206 Merge "Debug issue #17310019: pause when launching settings" into lmp-dev 2014-08-29 00:56:49 +00:00
Dianne Hackborn
ecf1cda068 Debug issue #17310019: pause when launching settings 
Let's log!

Change-Id: Icaf42d46aff6e74ee5fc98611dd77083a5d5052e
 2014-08-28 17:52:33 -07:00
Svetoslav
43da1d4a08 Merge "Fix app widget serices not being unbound." into lmp-dev 2014-08-29 00:51:49 +00:00
Svetoslav
2635b7b0d3 Fix app widget serices not being unbound. 
bug:17321037

Change-Id: I44578df1104f9bd2e28700a3422a3323844d92c0
 2014-08-28 17:41:49 -07:00
Alex Light
e545035e0e Remove obsolete pruneDexCache 
Bug: 16875245

(cherry picked from commit 09107db4916913912e61bfe592643b9c4c50b500)

Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
 2014-08-28 17:02:37 -07:00
Alex Light
55471dcd0f Change /dalvik-cache to be owned by root. 
Bug: 16875245

(cherry picked from commit 79bf4007f559e194205f632b23d2bfb6f8d1e7ba)

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
 2014-08-28 17:02:37 -07:00
Dongwon Kang
4c4eadc33d TIF: update the default value documentation of Channels.COLUMN_BROWSABLE. 
Bug: 17310177
Change-Id: Ibd765675983082f63fde3586b7c7cf6cd399c80d
 2014-08-29 08:58:30 +09:00
Dongwon Kang
371bee50f9 Merge "TIF: cosmetic changes for consistency." into lmp-dev 2014-08-28 23:49:33 +00:00
Dongwon Kang
fd8aa02d73 TIF: cosmetic changes for consistency. 
- Remove uncessarry logic in buildTvInputListLocked().
  (No longer needed because we removed availability.
   Verified the bug case, b/15738607, does not happen without this logic.)
- Rename member variables in XXXState classes.
- Define SessionCallback for consistency.

Change-Id: I49642c909ad7f77d97d1d90670c7bb7c2b12cda8
 2014-08-29 08:48:02 +09:00
Brian Carlstrom
6d3c8255ff Merge "Remove obsolete pruneDexCache" 2014-08-28 23:45:10 +00:00
RoboErik
6a6a8f0094 Fix test build 
Updates for MediaBrowser APIs. I missed some new demos that had been added which use
these APIs.

Change-Id: Ic42c9ba20a851c5b08c564cfc4de71bbe09ebdb9
 2014-08-28 23:37:22 +00:00
Jeff Sharkey
d6b03eecf0 Merge "Teach API lint about package layering!" into lmp-dev 2014-08-28 23:36:25 +00:00
George Mount
7b7499644c am 2d53188b: Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 
* commit '2d53188b2ed3950f4d1c7e5163ba181c83ea5c85':
  Fix NPE when transitioning on unattached scene root.
 2014-08-28 23:33:42 +00:00
George Mount
c07292aa90 am 48514832: Merge "Fix NPE when clicking "back" quickly." into lmp-dev 
* commit '48514832232eee579a1aab76d51c0adc8a36efc0':
  Fix NPE when clicking "back" quickly.
 2014-08-28 23:33:37 +00:00
Alex Light
09107db491 Remove obsolete pruneDexCache 
Bug: 16875245

Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
 2014-08-28 23:30:45 +00:00
John Reck
3296b922da am cfa308dc: am f26df60e: Merge "Track buildLayer calls, destroy if unused" into lmp-dev 
* commit 'cfa308dc1e42320d31414fa7050db3ffb778cdc2':
  Track buildLayer calls, destroy if unused
 2014-08-28 23:26:30 +00:00
Raph Levien
ea6a04a0c0 am 91c3bb3a: am 0dc8c30d: Merge "Ignore width of trailing whitespace for computing ellipsis" into lmp-dev 
* commit '91c3bb3a6d60e45cec919ea46ddcd51f1b1151c6':
  Ignore width of trailing whitespace for computing ellipsis
 2014-08-28 23:26:24 +00:00
RoboErik
f82483ec1e am c14e2251: am 3c951d03: Merge "Add javadoc to Window.set/getMediaController" into lmp-dev 
* commit 'c14e2251b1fc4460134acd4b1a18815b19cc03e4':
  Add javadoc to Window.set/getMediaController
 2014-08-28 23:26:19 +00:00
Chris Craik
82e65f75e8 am 9bb831a6: am 79c09015: Merge "Support Z reorder/shadows in root render node" into lmp-dev 
* commit '9bb831a61ce738af3d5ed58d5cd6a3ef86a4c94a':
  Support Z reorder/shadows in root render node
 2014-08-28 23:26:14 +00:00
George Mount
46a761db9a Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 2014-08-28 23:24:06 +00:00
George Mount
0f227c9a3d Merge "Fix NPE when clicking "back" quickly." into lmp-dev 2014-08-28 23:19:38 +00:00
George Mount
6276cd4b8d Fix NPE when transitioning on unattached scene root. 
Bug 17261558

Change-Id: Ib86c72e26f7fd9ac3fc47df650d95fdeeb43f1be
 2014-08-28 16:17:38 -07:00
Brian Carlstrom
7d86375b1e Merge "Change /dalvik-cache to be owned by root." 2014-08-28 23:17:04 +00:00
Jeff Sharkey
932a07cefe Teach API lint about package layering! 
Now it can identify layering violations, like when something deep in
android.os depends on android.app.

Change-Id: I94606c642195b3ed7558ff6979ed4a181cd85fa2
 2014-08-28 16:16:07 -07:00
George Mount
407d1fa52c Fix NPE when clicking "back" quickly. 
Bug 17319368

Change-Id: I8cf544aefa75bd5fe4f606e185f84977a36b0cdc
 2014-08-28 16:11:49 -07:00
Alan Viverette
ce32e9adf7 am 474af791: am 3516cdb9: Merge "Fix docs build" into lmp-dev 
* commit '474af791266d0829a232bbb7738981e0679f2649':
  Fix docs build
 2014-08-28 23:11:43 +00:00
Eino-Ville Talvala
96722e12b9 am 7d3c202c: am 12dba4a6: Merge "Camera2: Make sure aborting captures on an idle device works." into lmp-dev 
* commit '7d3c202cda7cd4791213c36234ab011bd895272a':
  Camera2: Make sure aborting captures on an idle device works.
 2014-08-28 23:11:38 +00:00