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

107651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ztenghui
34a5b011cd MediaMuxer sample code update, no functional change 
bug:9213533

Change-Id: I0d42ec58576d9fd797dba9c9c9f5ebed1170a818
 2013-05-31 10:50:08 -07:00
Scott Main
ca9948ae33 revise migrating to Studio procedure 
Change-Id: Ic8d2498414ccdbe45b7ce349ecb84925e9830ee9
 2013-05-31 10:42:35 -07:00
Joe Malin
1f59eb2ffa am 8f3f3f97: am dd51bc3f: am 13c305e9: am 09bc2f2d: am 7d469061: am 62ba3609: am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 
* commit '8f3f3f97e5f7e646e2d9932325f436b873487fa0':
  Fix #8499531: Command line instructions
 2013-05-31 09:13:43 -07:00
Joe Malin
8f3f3f97e5 am dd51bc3f: am 13c305e9: am 09bc2f2d: am 7d469061: am 62ba3609: am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 
* commit 'dd51bc3f5b21faebf8e6b6766f42262c1227c3f2':
  Fix #8499531: Command line instructions
 2013-05-31 09:11:37 -07:00
Joe Malin
dd51bc3f5b am 13c305e9: am 09bc2f2d: am 7d469061: am 62ba3609: am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 
* commit '13c305e944610d4b15f22908fed887f6fdbb42fa':
  Fix #8499531: Command line instructions
 2013-05-31 09:08:29 -07:00
Joe Malin
13c305e944 am 09bc2f2d: am 7d469061: am 62ba3609: am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 
* commit '09bc2f2d6449259bbd4820ec33ea7837996612ed':
  Fix #8499531: Command line instructions
 2013-05-31 09:06:39 -07:00
Joe Malin
09bc2f2d64 am 7d469061: am 62ba3609: am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 
* commit '7d469061ef7cec751fda3e9d13460d2465395d45':
  Fix #8499531: Command line instructions
 2013-05-31 09:04:23 -07:00
Joe Malin
7d469061ef am 62ba3609: am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 
* commit '62ba36096fa14bdc148bbfc85849a7bed44a1b82':
  Fix #8499531: Command line instructions
 2013-05-31 09:03:15 -07:00
Joe Malin
62ba36096f am 59e24472: Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 
* commit '59e24472f3fb4f3dc5d1acee40efd6b8b4d66bd7':
  Fix #8499531: Command line instructions
 2013-05-31 09:02:06 -07:00
Joe Malin
59e24472f3 Merge "Fix #8499531: Command line instructions" into jb-mr1.1-docs 2013-05-31 16:00:04 +00:00
Jean Chalard
e507c840c8 am 44baed2d: am af9e5e5f: Merge "Improve the documentation for InputConnection." into jb-mr2-dev 
* commit '44baed2dc31d29c48f5d49577c109ca3903ad915':
  Improve the documentation for InputConnection.
 2013-05-30 19:49:23 -07:00
Jean Chalard
44baed2dc3 am af9e5e5f: Merge "Improve the documentation for InputConnection." into jb-mr2-dev 
* commit 'af9e5e5f618448f77f74bb36e0adbe88cb2ae156':
  Improve the documentation for InputConnection.
 2013-05-30 19:47:41 -07:00
Jean Chalard
af9e5e5f61 Merge "Improve the documentation for InputConnection." into jb-mr2-dev 2013-05-31 02:44:08 +00:00
Dianne Hackborn
390517be2d Clean up some temporary allocations. 
Yay to ArrayMap, letting me get rid of a bunch of temporary
iterators in core code paths like updateOomAdj.  (Now I definitely
need an ArraySet to finish that up.)

Also clean up various other things that are doing unnecessary
allocations, clean up some debug output, make more of the debug
output respect package filtering.

Change-Id: Ib4979faf4de8c7912739bc0937c3fa9e7bfcde67
 2013-05-30 19:26:42 -07:00
Satoshi Kataoka
96687db3da Merge "Resolve inconsistent conditions in InputMethodService" 2013-05-31 01:46:54 +00:00
Jim Miller
dfb57cdcfc Fix keyguard issue where an incoming SMS would switch widget 
This fixes a bug where an incoming notification from AudioManager
would trigger showAppropriateWidgetPage() to be called even though
nothing has changed.

Fixes bug 9202611

Change-Id: If8bbd30b6b324233b5ad6552183c10cc5a335061
 2013-05-30 18:22:01 -07:00
Jeff Brown
718aefb6ff am 6474d840: am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 
* commit '6474d8407cb1551608fc403861e11cf514f8558e':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
 2013-05-30 18:02:31 -07:00
Jeff Brown
6474d8407c am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 
* commit '636af7a1cb90bb2f422bc85356d30f5b4e9342e6':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
 2013-05-30 18:00:08 -07:00
Jeff Brown
636af7a1cb Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 2013-05-31 00:54:41 +00:00
Romain Guy
54999da4b6 Remove MipmapDrawable 
It's a hidden API that nobody uses.

Change-Id: Ie0ecbc45cd191a595e53fe8765defe6f2aa7e3f6
 2013-05-30 17:34:27 -07:00
Joe Malin
98c2e56f8b Fix #8499531: Command line instructions 
Change-Id: I4922855443f1f85e52ad4016ea3e33925c60e08e
 2013-05-30 15:58:23 -07:00
Scott Main
c1e0ca9fee am f7d8d8bf: am e302c706: am c7dda645: am 77da4440: am 25a49f9f: fix IE 7/8 bugs on IO videos page 
* commit 'f7d8d8bfc57f46243398034216cd15938df76346':
  fix IE 7/8 bugs on IO videos page
 2013-05-30 15:23:37 -07:00
Svetoslav
6a3c3b838b am 5fecbf9d: am ec586994: Merge "CalendarView header not updated on year change." into jb-mr2-dev 
* commit '5fecbf9d10cd6e40204187e6a2970ed113e48350':
  CalendarView header not updated on year change.
 2013-05-30 15:16:25 -07:00
Daniel Sandler
2c52b08c33 am 491c6075: am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 
* commit '491c607582248590702ce07c0493ff0c39224689':
  Unhide action to launch Daydream settings.
 2013-05-30 15:16:14 -07:00
kmccormick
911cdd9959 am b2903bc6: am 03a91724: am fa312ff1: am 33b117c4: am 6959f7fa: am 4f3cadaf: am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit 'b2903bc64da3c684376c24cf485e90c9cf0736af':
  Doc change: document AppWidgetHost
 2013-05-30 15:16:04 -07:00
Matthew Xie
703ea1862e am 0fdb05a7: am b190890a: Merge "Update javadoc to give app write better guidence" into jb-mr2-dev 
* commit '0fdb05a770ce3ea0bd7f6ee9bae2283a38284607':
  Update javadoc to give app write better guidence
 2013-05-30 15:16:00 -07:00
Jean-Michel Trivi
905c2b1117 am 7d2e3939: am c1d47c50: Merge "Monitor device rotation" into jb-mr2-dev 
* commit '7d2e3939964fb6512f370059a33206d2c9ec7a0e':
  Monitor device rotation
 2013-05-30 15:15:18 -07:00
Jeff Brown
14507e257a Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity. 
Bug: 9210033
Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
 2013-05-30 14:44:18 -07:00
The Android Open Source Project
399e48e15b am f3c29813: (-s ours) Reconcile with jb-mr2-release - do not merge 
* commit 'f3c29813090539d398bfa7b9bd8ad8398bf23944':
 2013-05-30 14:24:18 -07:00
Jason Noguchi
8b6bbb58c8 am b809577f: am b318f7b9: Merge "Refactor of camera stress test to add camera test helper. Also add additional functional tests for: flash, exposure, white balance, and focus mode. Also add pairwise tests." into jb-mr2-dev 
* commit 'b809577f46c44cd61e4f719b4cd810115bdcf367':
  Refactor of camera stress test to add camera test helper. Also add additional functional tests for: flash, exposure, white balance, and focus mode.  Also add pairwise tests.
 2013-05-30 14:23:54 -07:00
Victoria Lease
2595f4afe1 am 51ff6f95: (-s ours) am d9f7250a: Merge "break up LocationManagerService\'s WakeLock" into jb-mr2-dev 
* commit '51ff6f953c8ddb89fdcdccc9799445b65556b711':
  break up LocationManagerService's WakeLock
 2013-05-30 14:23:49 -07:00
Scott Main
f7d8d8bfc5 am e302c706: am c7dda645: am 77da4440: am 25a49f9f: fix IE 7/8 bugs on IO videos page 
* commit 'e302c70643e006581c535c76c1c5d50372586ede':
  fix IE 7/8 bugs on IO videos page
 2013-05-30 14:02:05 -07:00
Scott Main
e302c70643 am c7dda645: am 77da4440: am 25a49f9f: fix IE 7/8 bugs on IO videos page 
* commit 'c7dda6454fb513676575a9ce2b28112cdab6cb05':
  fix IE 7/8 bugs on IO videos page
 2013-05-30 14:00:16 -07:00
Scott Main
c7dda6454f am 77da4440: am 25a49f9f: fix IE 7/8 bugs on IO videos page 
* commit '77da444049f526cf702403f2543a26e208bd8c7b':
  fix IE 7/8 bugs on IO videos page
 2013-05-30 13:58:17 -07:00
Scott Main
77da444049 am 25a49f9f: fix IE 7/8 bugs on IO videos page 
* commit '25a49f9f2e33540dc413210f9dd09c6cec141896':
  fix IE 7/8 bugs on IO videos page
 2013-05-30 13:56:02 -07:00
Scott Main
25a49f9f2e fix IE 7/8 bugs on IO videos page 
Change-Id: I94d47989e8c1075c9864d0a4577434917a7913d7
 2013-05-30 13:51:08 -07:00
Dmitry Shmidt
e659f12f0f Merge "wifi: Match function prototype from libhardware_legacy" 2013-05-30 20:00:51 +00:00
Svetoslav
5fecbf9d10 am ec586994: Merge "CalendarView header not updated on year change." into jb-mr2-dev 
* commit 'ec58699413ebe4cc2a72a8aae3c420fb3d764457':
  CalendarView header not updated on year change.
 2013-05-30 12:50:15 -07:00
Svetoslav
ec58699413 Merge "CalendarView header not updated on year change." into jb-mr2-dev 2013-05-30 19:49:00 +00:00
Daniel Sandler
491c607582 am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 
* commit '054255c6d282a4ab2a95e56859242a2512871296':
  Unhide action to launch Daydream settings.
 2013-05-30 12:36:59 -07:00
Daniel Sandler
054255c6d2 Merge "Unhide action to launch Daydream settings." into jb-mr2-dev 2013-05-30 19:33:07 +00:00
kmccormick
b2903bc64d am 03a91724: am fa312ff1: am 33b117c4: am 6959f7fa: am 4f3cadaf: am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit '03a9172407103a8788e526be41a7d2c018e426ca':
  Doc change: document AppWidgetHost
 2013-05-30 12:03:01 -07:00
kmccormick
03a9172407 am fa312ff1: am 33b117c4: am 6959f7fa: am 4f3cadaf: am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit 'fa312ff108702388574021a8de22092cdde5dd6f':
  Doc change: document AppWidgetHost
 2013-05-30 12:00:58 -07:00
kmccormick
fa312ff108 am 33b117c4: am 6959f7fa: am 4f3cadaf: am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit '33b117c493dbddbbe688aa618b99db99ae71d1de':
  Doc change: document AppWidgetHost
 2013-05-30 11:59:00 -07:00
kmccormick
33b117c493 am 6959f7fa: am 4f3cadaf: am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit '6959f7fad13018e14255ea98ada4221cca28bfab':
  Doc change: document AppWidgetHost
 2013-05-30 11:56:48 -07:00
kmccormick
6959f7fad1 am 4f3cadaf: am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit '4f3cadafbb1aa53cbd197239127b1d3c626cb0df':
  Doc change: document AppWidgetHost
 2013-05-30 11:54:02 -07:00
kmccormick
4f3cadafbb am b3803855: Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 
* commit 'b3803855b0554879836c18b4157194b9c2061219':
  Doc change: document AppWidgetHost
 2013-05-30 11:52:11 -07:00
Matthew Xie
0fdb05a770 am b190890a: Merge "Update javadoc to give app write better guidence" into jb-mr2-dev 
* commit 'b190890a94dc2f0bd11da09f59550f86197f010a':
  Update javadoc to give app write better guidence
 2013-05-30 11:50:02 -07:00
kmccormick
b3803855b0 Merge "Doc change: document AppWidgetHost" into jb-mr1.1-docs 2013-05-30 18:48:27 +00:00
Matthew Xie
b190890a94 Merge "Update javadoc to give app write better guidence" into jb-mr2-dev 2013-05-30 18:45:42 +00:00