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

28509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
6ba052b484 am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread 
Merge commit 'c1a564b108c511c0bdd699567c245b031930e718' into gingerbread-plus-aosp

* commit 'c1a564b108c511c0bdd699567c245b031930e718':
  Add support for secure system overlays.  (DO NOT MERGE)
 2010-10-15 18:40:39 -07:00
Justin Ho
bce520e646 am b3c2d480: Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" into gingerbread 
Merge commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca' into gingerbread-plus-aosp

* commit 'b3c2d4807f6bc631e2d1091ca4ebb8df39195bca':
  DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)
 2010-10-15 18:39:33 -07:00
Scott Main
20856f71d9 am c9f7890a: Revise some javadocs for NFC; add package description 
Merge commit 'c9f7890a203a013646650a695157277df81b6a17' into gingerbread-plus-aosp

* commit 'c9f7890a203a013646650a695157277df81b6a17':
  Revise some javadocs for NFC; add package description
 2010-10-15 18:25:34 -07:00
Shimeng (Simon) Wang
53820a9694 am 7ef6834e: Merge "DO NOT MERGE" into gingerbread 
Merge commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7' into gingerbread-plus-aosp

* commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7':
  DO NOT MERGE
 2010-10-15 18:25:25 -07:00
Andreas Huber
fb47487259 am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread 
Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp

* commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678':
  Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
 2010-10-15 18:25:14 -07:00
Andreas Huber
746c6a1c6d am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread 
Merge commit 'ff7a7a455c15077e2b691efa370619f06058f697' into gingerbread-plus-aosp

* commit 'ff7a7a455c15077e2b691efa370619f06058f697':
  Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
 2010-10-15 18:24:56 -07:00
Dianne Hackborn
13e46665ff am 736f5ec4: Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread 
Merge commit '736f5ec476526f3431d81dec5fb695bdee27e21a' into gingerbread-plus-aosp

* commit '736f5ec476526f3431d81dec5fb695bdee27e21a':
  Work on issue #3101415: Crespo apps seem to have their UID changed over time.
 2010-10-15 18:24:49 -07:00
Irfan Sheriff
cf66f58751 am 4e08a985: Merge "fix build DO NOT MERGE" into gingerbread 
Merge commit '4e08a985418f581b4ca8c46316c85defd7b173cd' into gingerbread-plus-aosp

* commit '4e08a985418f581b4ca8c46316c85defd7b173cd':
  fix build DO NOT MERGE
 2010-10-15 18:24:37 -07:00
Justin Ho
e35cd5f569 am 73dbdc35: Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread 
Merge commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940' into gingerbread-plus-aosp

* commit '73dbdc35d4db5a03310bec8d8d7dcb58dba0c940':
  DO NOT MERGE - Updated media transport controls (hdpi and mdpi)
 2010-10-15 18:24:30 -07:00
Shimeng (Simon) Wang
d687504e73 am 31e4d66a: Merge "DO NOT MERGE" into gingerbread 
Merge commit '31e4d66ada01ea0714304309967a38d07bfce6c6' into gingerbread-plus-aosp

* commit '31e4d66ada01ea0714304309967a38d07bfce6c6':
  DO NOT MERGE
 2010-10-15 18:24:06 -07:00
Leon Scroggins
46ca6a2289 am 36cb18cf: Merge "Line up textfield with WebTextView more often." into gingerbread 
Merge commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4' into gingerbread-plus-aosp

* commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4':
  Line up textfield with WebTextView more often.
 2010-10-15 18:23:58 -07:00
Irfan Sheriff
cf054d1cf6 am f8834f87: Merge "fetch macaddr right after supplicant connection" into gingerbread 
Merge commit 'f8834f878fb6911cbd4719640cd2e6bf3a958a92' into gingerbread-plus-aosp

* commit 'f8834f878fb6911cbd4719640cd2e6bf3a958a92':
  fetch macaddr right after supplicant connection
 2010-10-15 18:23:47 -07:00
Scott Main
81df9841c6 am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo 
Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp

* commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b':
  docs: fix typo; surface dev guide link in package description
 2010-10-15 18:23:34 -07:00
Scott Main
b2bd470010 am 7f3addf3: am 09da9609: docs: fix code snippet errors 
Merge commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb' into gingerbread-plus-aosp

* commit '7f3addf37f0aa106507792e8d9eaa3fb6662cdbb':
  docs: fix code snippet errors
 2010-10-15 18:23:26 -07:00
Justin Ho
92e0fd6ce2 am d3643668: Merge "DO NOT MERGE - Updated ADB icon" into gingerbread 
Merge commit 'd364366824bf2b0aef81780eb673a42e0ba33bce' into gingerbread-plus-aosp

* commit 'd364366824bf2b0aef81780eb673a42e0ba33bce':
  DO NOT MERGE - Updated ADB icon
 2010-10-15 18:23:18 -07:00
Dianne Hackborn
10d48f26e7 am efb58101: Debug logs for issue #3101415: Apps seem to have their UID changed over time. 
Merge commit 'efb581018bbede2ecdc76bcd9722ded5b6903254' into gingerbread-plus-aosp

* commit 'efb581018bbede2ecdc76bcd9722ded5b6903254':
  Debug logs for issue #3101415: Apps seem to have their UID changed over time.
 2010-10-15 18:22:25 -07:00
Jean-Baptiste Queru
36e7790b6b Merge a851d8d0 from gingerbread 
Change-Id: Iea0e3fa1662d6326ab337821fe52a65a9dfd989a
 2010-10-15 17:02:57 -07:00
Jeff Brown
c1a564b108 Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread 2010-10-15 16:52:02 -07:00
Justin Ho
b3c2d4807f Merge "DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi)" into gingerbread 2010-10-15 16:43:42 -07:00
Justin Ho
1ef2006409 DO NOT MERGE - Quick fix for menu background for SDK/emulator (mdpi) 
Change-Id: I5f86585618b008b727de2236b75b357c87840ecf
 2010-10-15 16:15:16 -07:00
Jeff Brown
2d3f159aa9 Add support for secure system overlays. (DO NOT MERGE) 
This change adds a new window type for secure system overlays
created by the system itself from non-secure system overlays that
might be created by applications that have the system alert permission.
Secure views ignore the presence of secure system overlays.

Bug: 3098519
Change-Id: I8f8398f4fdeb0469e5d71124c21bedf121bd8c07
 2010-10-15 16:03:35 -07:00
Scott Main
c9f7890a20 Revise some javadocs for NFC; add package description 
Change-Id: I60223e2ad24af98b3b16a74960365185096ae614
 2010-10-15 15:27:16 -07:00
Shimeng (Simon) Wang
7ef6834eea Merge "DO NOT MERGE" into gingerbread 2010-10-15 15:17:22 -07:00
Andreas Huber
b04f356d86 Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread 2010-10-15 14:58:54 -07:00
Andreas Huber
ff7a7a455c Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread 2010-10-15 14:58:05 -07:00
Dianne Hackborn
736f5ec476 Merge "Work on issue #3101415: Crespo apps seem to have their UID changed over time." into gingerbread 2010-10-15 14:55:06 -07:00
Dianne Hackborn
8bdf5935c0 Work on issue #3101415: Crespo apps seem to have their UID changed over time. 
fsync!

Change-Id: Ie6c5397202579935ac69bf61d3e7b3081ecf269c
 2010-10-15 14:46:33 -07:00
Irfan Sheriff
4e08a98541 Merge "fix build DO NOT MERGE" into gingerbread 2010-10-15 14:30:36 -07:00
Irfan Sheriff
84510802f1 fix build DO NOT MERGE 
my local change and gerritt were out of sync

Change-Id: Ie581425f0290bb78b289584067b70507d82d5a57
 2010-10-15 14:27:22 -07:00
Justin Ho
73dbdc35d4 Merge "DO NOT MERGE - Updated media transport controls (hdpi and mdpi)" into gingerbread 2010-10-15 14:26:08 -07:00
Shimeng (Simon) Wang
bf9cf4d80d DO NOT MERGE 
Add wrapper method for native JNI call.

This is to check whether a given mimeType is supported in Android media
framework.

issue: 3101402
Change-Id: Ic8b412c045c36113c830296dacb42ed5f7371c9d
 2010-10-15 14:18:01 -07:00
Shimeng (Simon) Wang
31e4d66ada Merge "DO NOT MERGE" into gingerbread 2010-10-15 14:07:29 -07:00
Justin Ho
ff14aa16ba DO NOT MERGE - Updated media transport controls (hdpi and mdpi) 
Change-Id: I9b91c4bc13909017f433724e7c21de0db690eff6
 2010-10-15 14:03:57 -07:00
Leon Scroggins
36cb18cf06 Merge "Line up textfield with WebTextView more often." into gingerbread 2010-10-15 13:58:38 -07:00
Irfan Sheriff
f8834f878f Merge "fetch macaddr right after supplicant connection" into gingerbread 2010-10-15 13:42:38 -07:00
Shimeng (Simon) Wang
9f547a8ca8 DO NOT MERGE 
Avoid sending false orientation event to webkit.

issue: 3101311
Change-Id: I819f046a119ad108256d6cece3f2e6ec1d643145
 2010-10-15 13:34:49 -07:00
Andreas Huber
a4f391c9bf Include the framework copy of the OpenMAX headers instead of referencing external/opencore. 
Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6
related-to-bug: 3101573
 2010-10-15 13:31:29 -07:00
Andreas Huber
6ac35f0597 Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore. 
Change-Id: Ie2ecf9558d4ee80cb5a2bbe66ad49f2165a7b09c
related-to-bug: 3101573
 2010-10-15 13:30:27 -07:00
Scott Main
2c1dab4483 am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo 
Merge commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c' into gingerbread

* commit 'fda5b19c757645e957c2a224f269aefe39fb1e1c':
  docs: fix typo; surface dev guide link in package description
 2010-10-15 12:35:04 -07:00
Scott Main
7f3addf37f am 09da9609: docs: fix code snippet errors 
Merge commit '09da96099917141f2b90d53f61baa822bdd434d7' into gingerbread

* commit '09da96099917141f2b90d53f61baa822bdd434d7':
  docs: fix code snippet errors
 2010-10-15 12:34:50 -07:00
Justin Ho
d364366824 Merge "DO NOT MERGE - Updated ADB icon" into gingerbread 2010-10-15 11:53:49 -07:00
Leon Scroggins
2a30744cd7 Line up textfield with WebTextView more often. 
Bug:3097705

Line up when the selection changes (such as when the
selection is altered by the context menu) or when the
WebTextView scrolls.

Change-Id: Ia491064548131be1ac6f4d701a43cd8419a25367
 2010-10-15 14:49:18 -04:00
Justin Ho
7e9f686413 DO NOT MERGE - Updated ADB icon 
Change-Id: I358ce60203746ccf38d92f71d1c684670737c97b
 2010-10-15 11:31:35 -07:00
Dianne Hackborn
efb581018b Debug logs for issue #3101415: Apps seem to have their UID changed over time. 
- Activity manager now prints the pid doing a startActivity request.
- Package manager now remembers messages about problems it has parsing
  packages.xml.

Change-Id: I11a75aa3953dbfa5dd41cfbdf69116c764ec228f
 2010-10-15 11:22:17 -07:00
Nick Pelly
a851d8d0cf Merge "NFC: Move NFC service implementation out of system_server." into gingerbread 2010-10-15 10:55:11 -07:00
Scott Main
fda5b19c75 Merge "docs: fix typo; surface dev guide link in package description" into froyo 2010-10-15 10:46:33 -07:00
Scott Main
09da960999 docs: fix code snippet errors 
Change-Id: Ie0ef6d4e642b6f9a68bdadd3e507f9fe2dd323d9
 2010-10-15 10:40:54 -07:00
Irfan Sheriff
79f7fe2daa fetch macaddr right after supplicant connection 
Bug: 3072163
Change-Id: I13466e3bc73a1a95d42faf17650fad4383f7e5b2
 2010-10-15 10:30:14 -07:00
Scott Main
36cdecd89d docs: fix typo; surface dev guide link in package description 
Change-Id: I2dc09bb6b79cbe3f80819d6193eb0d8a3565310d
 2010-10-15 10:19:27 -07:00
Nick Kralevich
6bc34da8ac am 612ebb92: Revert "Update the documentation for content provider security." 
Merge commit '612ebb9257e2adf982ed846fa43251c3754361f7' into gingerbread-plus-aosp

* commit '612ebb9257e2adf982ed846fa43251c3754361f7':
  Revert "Update the documentation for content provider security."
 2010-10-15 10:11:50 -07:00