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

154079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Light
9daa2aa9d1 am d0674838: am 63a1740d: am 19f3d22f: Change /dalvik-cache to be owned by root. 
* commit 'd0674838f9c7d950d34c0e01727c7c22dfc3992e':
  Change /dalvik-cache to be owned by root.
 2014-08-29 04:20:11 +00:00
Dongwon Kang
a859169324 am 444da437: am 8f50a388: am 6b9575be: Merge "TIF: cosmetic changes for consistency." into lmp-dev 
* commit '444da43744719467c6deb385ba13fbff5fa606d0':
  TIF: cosmetic changes for consistency.
 2014-08-29 04:20:05 +00:00
RoboErik
53eb8c9c15 am 501244ea: am 563efe4c: am 85f23210: Fix test build 
* commit '501244eaec4207efd413bac4b0bb86ec15f97bf5':
  Fix test build
 2014-08-29 04:20:00 +00:00
Jeff Sharkey
a63cda7b24 am dd928c7e: am f9dfbbf3: am f894a0d3: Merge "Teach API lint about package layering!" into lmp-dev 
* commit 'dd928c7e214ff7fd865e4b71bf273ae57691922c':
  Teach API lint about package layering!
 2014-08-29 04:19:54 +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
01dfc9c69f am 07a0a79b: am f16343b7: am 2d53188b: Merge "Fix NPE when transitioning on unattached scene root." into lmp-dev 
* commit '07a0a79b85e3b7d7d9f755a4b45e0b01bc3e1076':
  Fix NPE when transitioning on unattached scene root.
 2014-08-29 03:36:21 +00:00
George Mount
e8ba00771f am e770e3a1: am 202532da: am 48514832: Merge "Fix NPE when clicking "back" quickly." into lmp-dev 
* commit 'e770e3a196a252e14079b9708ddfad2db19f4d19':
  Fix NPE when clicking "back" quickly.
 2014-08-29 03:36:16 +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
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
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
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
John Reck
1f9d2dffca am e310b356: am cfa308dc: am f26df60e: Merge "Track buildLayer calls, destroy if unused" into lmp-dev 
* commit 'e310b35694e88b1d25eeea81204d3495c698d557':
  Track buildLayer calls, destroy if unused
 2014-08-28 23:45:13 +00:00
Raph Levien
95b97f2af9 am c5aa086c: (-s ours) am 91c3bb3a: am 0dc8c30d: Merge "Ignore width of trailing whitespace for computing ellipsis" into lmp-dev 
* commit 'c5aa086c392dfd8c27ffd8f7969979a61f265517':
  Ignore width of trailing whitespace for computing ellipsis
 2014-08-28 23:45:08 +00:00
RoboErik
2ff12530f8 am b4e6da04: am c14e2251: am 3c951d03: Merge "Add javadoc to Window.set/getMediaController" into lmp-dev 
* commit 'b4e6da04dc95d9fb3e55645fcdf04cf914a5b41e':
  Add javadoc to Window.set/getMediaController
 2014-08-28 23:38:27 +00:00
Chris Craik
6138a34685 am c068508c: am 9bb831a6: am 79c09015: Merge "Support Z reorder/shadows in root render node" into lmp-dev 
* commit 'c068508c0ee2c05af07e794fe405bb1891c6799d':
  Support Z reorder/shadows in root render node
 2014-08-28 23:38:12 +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
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
Alan Viverette
e1a704c3d8 am bd1e7afa: am 474af791: am 3516cdb9: Merge "Fix docs build" into lmp-dev 
* commit 'bd1e7afa1338d6bec8ed766c9793d7e2e101e7d3':
  Fix docs build
 2014-08-28 23:24:13 +00:00
Eino-Ville Talvala
ed176f2e70 am 380946dd: am 7d3c202c: am 12dba4a6: Merge "Camera2: Make sure aborting captures on an idle device works." into lmp-dev 
* commit '380946dd18e8f6fb725e5b348c43bf7416843561':
  Camera2: Make sure aborting captures on an idle device works.
 2014-08-28 23:24:09 +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
Alan Viverette
9cc4bda235 am e9d79974: am 33f52f1e: am f104c2f9: Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 
* commit 'e9d79974a26ffd49eea25eaf03627eecec914349':
  Cancel the date picker dialog when BUTTON_NEGATIVE is clicked
 2014-08-28 23:24:04 +00:00
Diego Pontoriero
86b48ac335 am ca03ee0e: am 0c39756f: am 2498df27: Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 
* commit 'ca03ee0ec5dcb451739ff6a0399a9e0caf9ecae3':
  Change TelephonyManager method name to accurately reflect functionality.
 2014-08-28 23:23:58 +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
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
Alan Viverette
0a838608c8 am 33f52f1e: am f104c2f9: Merge "Cancel the date picker dialog when BUTTON_NEGATIVE is clicked" into lmp-dev 
* commit '33f52f1e6fba8b0cdcdefaff9bc8199f4021c48a':
  Cancel the date picker dialog when BUTTON_NEGATIVE is clicked
 2014-08-28 23:11:33 +00:00
Diego Pontoriero
350052ec9c am 0c39756f: am 2498df27: Merge "Change TelephonyManager method name to accurately reflect functionality." into lmp-dev 
* commit '0c39756f39b4098bdf8b3f391652046cc565018c':
  Change TelephonyManager method name to accurately reflect functionality.
 2014-08-28 23:11:29 +00:00
John Reck
8d4c198a35 am f26df60e: Merge "Track buildLayer calls, destroy if unused" into lmp-dev 
* commit 'f26df60e4d7a586164bd535b1f86f7971a4f13b4':
  Track buildLayer calls, destroy if unused
 2014-08-28 23:08:53 +00:00
Raph Levien
28565a9e9b am 0dc8c30d: Merge "Ignore width of trailing whitespace for computing ellipsis" into lmp-dev 
* commit '0dc8c30d6f4a8e4cecd9ab0749497227e0f561e4':
  Ignore width of trailing whitespace for computing ellipsis
 2014-08-28 23:08:48 +00:00
RoboErik
6f2b2b0c2e am 3c951d03: Merge "Add javadoc to Window.set/getMediaController" into lmp-dev 
* commit '3c951d03435a6239d07ff1131db28c9f6f04c78b':
  Add javadoc to Window.set/getMediaController
 2014-08-28 23:08:44 +00:00
Jeff Sharkey
66f2025fdd am e238044d: am 2cf50caa: am babbcbb1: Merge "Lint tool for current.txt." into lmp-dev 
* commit 'e238044d68d5a51bb2c22a272938d9ee80eebef1':
  Lint tool for current.txt.
 2014-08-28 23:08:41 +00:00
Chris Craik
067a7e4140 am 79c09015: Merge "Support Z reorder/shadows in root render node" into lmp-dev 
* commit '79c09015c031d441baabbd561b83c081c8015662':
  Support Z reorder/shadows in root render node
 2014-08-28 23:08:40 +00:00
Jean-Michel Trivi
12542f1757 am b49dfbef: am d6e389e8: am 2d770004: Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev 
* commit 'b49dfbef478aeaf1f88056fe14a85970a9580f2d':
  android.media.Ringtone: add getter for AudioAttributes
 2014-08-28 23:08:36 +00:00