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

101029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
208d937b61 Better exceptions when LoadedApk fails. 
Change-Id: Iba578c3872c6aeba3bf468735f06bd486d661454
 2013-02-25 13:17:54 -08:00
Craig Mautner
716e57b611 Merge "Conversion from mHistory to mTaskHistory." 2013-02-25 20:57:49 +00:00
Joe Malin
93e8c77788 am 88a1cf84: am 0c7d1aba: am b8df147c: am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit '88a1cf841ef8b5792fad8f3af4b4831101497c6c':
  Bug 8261430: Typo in Notifications
 2013-02-25 19:44:35 +00:00
Joe Malin
88a1cf841e am 0c7d1aba: am b8df147c: am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit '0c7d1abaae25073cafa4542ee032df9c54a01cd9':
  Bug 8261430: Typo in Notifications
 2013-02-25 19:39:41 +00:00
Joe Malin
0c7d1abaae am b8df147c: am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit 'b8df147c59381cc66b5acd3718aa3fc1eaa851b6':
  Bug 8261430: Typo in Notifications
 2013-02-25 11:37:15 -08:00
Joe Malin
b8df147c59 am 5c8bba35: am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit '5c8bba358634b20b47a87dcdb65d01988258cc53':
  Bug 8261430: Typo in Notifications
 2013-02-25 11:36:02 -08:00
Joe Malin
5c8bba3586 am cfb153b1: am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit 'cfb153b146b7d1627bdc02e2dc24becb2da5b12b':
  Bug 8261430: Typo in Notifications
 2013-02-25 11:34:46 -08:00
Joe Malin
cfb153b146 am 06764394: Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 
* commit '06764394eb9e4ba4e5f87c816827d82c93b5e71c':
  Bug 8261430: Typo in Notifications
 2013-02-25 11:32:22 -08:00
Joe Malin
06764394eb Merge "Bug 8261430: Typo in Notifications" into jb-mr1-dev 2013-02-25 19:29:06 +00:00
Ben Murdoch
ba67d28eef Update WebView#loadDataWithBaseURL documentation. 
historyURL must be a valid URL.

Bug: 7907196
Change-Id: Id1182537e073a9dd7746e23eec20accacedd9fc8
 2013-02-25 19:18:19 +00:00
Jeff Sharkey
7235e1c39d am 954e3e90: Merge "Require command and argument separation, cleanup." into jb-mr2-dev 
* commit '954e3e90181533041858f230cc10388f4c90e014':
  Require command and argument separation, cleanup.
 2013-02-25 19:17:42 +00:00
Jeff Sharkey
954e3e9018 Merge "Require command and argument separation, cleanup." into jb-mr2-dev 2013-02-25 19:13:00 +00:00
Jeff Sharkey
7b4596fd68 Require command and argument separation, cleanup. 
When invoking NativeDaemonCommands, require that base command and
arguments are separate.  Clean up reverse tethering commands, and
remove deprecated throttle events.

Change-Id: I302a74130b4f7c3f3045815a56d566e89c8969f6
 2013-02-25 11:02:50 -08:00
Scott Main
c248bfccbe am f4b36ad1: am c4bed529: am 93b4fcf4: am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page 
* commit 'f4b36ad1617920691def64c00179666e2e42d5fa':
  docs: add google io registration announcement to home page
 2013-02-25 18:51:59 +00:00
Scott Main
f4b36ad161 am c4bed529: am 93b4fcf4: am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page 
* commit 'c4bed529101b233f66e60e18a54ef6c9b97357f4':
  docs: add google io registration announcement to home page
 2013-02-25 18:46:53 +00:00
Scott Main
c4bed52910 am 93b4fcf4: am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page 
* commit '93b4fcf44bc9ff3ea3359382fb4ba4e2da6a73c8':
  docs: add google io registration announcement to home page
 2013-02-25 10:44:16 -08:00
Scott Main
93b4fcf44b am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page 
* commit 'f714e0781e30a5cb68326ff2381af3999e0a3e0d':
  docs: add google io registration announcement to home page
 2013-02-25 10:42:41 -08:00
Scott Main
f714e0781e am b38066bb: am d51eebae: docs: add google io registration announcement to home page 
* commit 'b38066bb22e0e71c6e03697d2b3fc18050ff4c76':
  docs: add google io registration announcement to home page
 2013-02-25 10:41:41 -08:00
Scott Main
b38066bb22 am d51eebae: docs: add google io registration announcement to home page 
* commit 'd51eebae6d5d798e5af2ec49f77d4b5fcf1678b7':
  docs: add google io registration announcement to home page
 2013-02-25 10:40:34 -08:00
Scott Main
d51eebae6d docs: add google io registration announcement to home page 
Change-Id: I638e9b720f027cd08b5a46f91339597fe954cb42
 2013-02-25 10:36:03 -08:00
Joe Fernandez
005b32baba am 02a4cec1: am 1f954f2f: am d5f87129: am 2ca291b8: am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev 
* commit '02a4cec107f1f07409fd03106b1cde56043894fa':
  docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
 2013-02-25 18:29:02 +00:00
Joe Fernandez
02a4cec107 am 1f954f2f: am d5f87129: am 2ca291b8: am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev 
* commit '1f954f2feedbff1ccfd9154611ac915f0c1c2e47':
  docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
 2013-02-25 18:25:15 +00:00
Joe Fernandez
1f954f2fee am d5f87129: am 2ca291b8: am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev 
* commit 'd5f87129757814e7fa83739afb921fe42d9e7454':
  docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
 2013-02-25 10:22:43 -08:00
Joe Malin
43f81181bc Bug 8261430: Typo in Notifications 
Change-Id: Ia0de6eec870f75cb31e082fba5a8b6764d6e4810
 2013-02-25 10:20:29 -08:00
Joe Fernandez
d5f8712975 am 2ca291b8: am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev 
* commit '2ca291b82106b998d544c47454dc595a2430864d':
  docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
 2013-02-25 10:19:59 -08:00
Joe Fernandez
2ca291b821 am 9faf0664: Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev 
* commit '9faf06644da1dc893d74f15ddd69a2e4201b6e07':
  docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f
 2013-02-25 10:14:57 -08:00
Ian Rogers
88e23bf938 am fec1178b: am 92f3e9a1: am e88c0d9e: Merge "Recognize odex files in memory accounting." 
* commit 'fec1178bbf7a2222d15a9710db58a248ec85eca2':
  Recognize odex files in memory accounting.
 2013-02-25 18:14:04 +00:00
Joe Fernandez
9faf06644d Merge "docs: SDK Platform image JB-MR1.1 and Support Library r12 Release Notes formerly Change-Id: I54a58649c226b61c3707d0a5385fa97ed029e32f" into jb-mr1.1-dev 2013-02-25 18:10:54 +00:00
Ian Rogers
fec1178bbf am 92f3e9a1: am e88c0d9e: Merge "Recognize odex files in memory accounting." 
* commit '92f3e9a1fba2873c00d1d89179c051a82e924d76':
  Recognize odex files in memory accounting.
 2013-02-25 18:09:55 +00:00
Baligh Uddin
1441e6fa32 Merge "Import translations. DO NOT MERGE" 2013-02-25 18:07:01 +00:00
Ian Rogers
92f3e9a1fb am e88c0d9e: Merge "Recognize odex files in memory accounting." 
* commit 'e88c0d9ec374ec4dcca6ccd8d440610ea83622c9':
  Recognize odex files in memory accounting.
 2013-02-25 10:04:53 -08:00
Baligh Uddin
d64b5d6683 Merge "Import translations. DO NOT MERGE" 2013-02-25 18:03:52 +00:00
Craig Mautner
56f52db423 Convert mHistory to mTaskHistory (2) 
- findActivityInHistoryLocked
- moveActivityToFrontLocked
- forceStopPackageLocked

Change-Id: I9dec65fc4cff12184e144b1ad2d39ffbfed0b270
 2013-02-25 10:03:01 -08:00
Craig Mautner
d26851d955 Merge "Refactor resetTaskIfNeededLocked for tasks." 2013-02-25 18:02:05 +00:00
Maggie Benthall
6794458f86 Add location sharing toggle user restriction. 
And add support for respecting it.

Change-Id: Ia5cf9134c5f5741c3f55afadbe54f862da7bfe5b
 2013-02-25 12:45:14 -05:00
Eino-Ville Talvala
788717ca59 Camera and MediaRecorder: Support AppOps 
- Allow media processes to update AppOps state
- Pass package name to media services

Bug: 8181262
Change-Id: I115d39f0b306cb9eb7cd3d3e663c680b7322fd3f
 2013-02-25 09:27:42 -08:00
Ian Rogers
e88c0d9ec3 Merge "Recognize odex files in memory accounting." 2013-02-25 17:13:24 +00:00
Baligh Uddin
351600ec71 Import translations. DO NOT MERGE 
Change-Id: Ie31e6632a217b9b9c7c0ebb79b16747830370db1
Auto-generated-cl: translation import
 2013-02-25 08:53:09 -08:00
Baligh Uddin
be46b8ccd2 Import translations. DO NOT MERGE 
Change-Id: Icdfc932c8898e3c716e012d384afa2521d3ac11c
Auto-generated-cl: translation import
 2013-02-25 08:52:34 -08:00
Wink Saville
ff4fcdb98c Tweak logging and some code reformatting. 
Add logAndAddLogRec method that logs a string and adds it to LogRecords.
Add loge(s, e)
Add missing javadoc to the logging methods
Reformatted the code.

Change-Id: I42f39e45aae77e5b6968f16b6b83f4804ccb7e73
 2013-02-24 07:21:45 -08:00
Craig Mautner
d44711ddd3 Conversion from mHistory to mTaskHistory. 
Change-Id: I7c43a923ce248edb4ca7d5fc6d1e0c492522f5a0
 2013-02-23 11:24:36 -08:00
Craig Mautner
e3a74d5d64 Refactor resetTaskIfNeededLocked for tasks. 
Change-Id: I1ad8b7ffe1f17490ebcb98ea48d57f0b15f888c9
 2013-02-23 08:37:20 -08:00
Michael Wright
c50536b85a Merge "Disable kernel keyrepeat" 2013-02-23 06:33:08 +00:00
Elliott Hughes
dbc3c407ae Remove obsolete traceview file format documentation. 
Bug: http://code.google.com/p/android/issues/detail?id=51286
Change-Id: I9f2093c81b194526e79ea098ae073b60c63e9442
 2013-02-22 21:21:03 -08:00
Ian Rogers
9f8589c31f Recognize odex files in memory accounting. 
Give odex files the same heap category as dex files.

Change-Id: I82539e20ac20a2b80c63c0cfceb266d9c59e22b7
 2013-02-22 20:35:56 -08:00
Mathias Agopian
0d1ab1db22 Merge "regenerate egl/gles stubs from glgen" 2013-02-23 04:13:34 +00:00
Mathias Agopian
89be00bcda regenerate egl/gles stubs from glgen 
those are minor cosmetic changes.

Change-Id: I84ee5383577f0ca33ed7cc32d03e53c1475f068d
 2013-02-22 20:08:06 -08:00
Dianne Hackborn
bd0dc13cb8 Merge "Formalize overscan metrics." 2013-02-23 03:15:35 +00:00
Dianne Hackborn
c4aad01cbb Formalize overscan metrics. 
The window manager now maintains and reports a new formal
"overscan insets" for each window, much like the existing
content and visible insets.  This is used to correctly
position the various UI elements in the various combination
of layout options.  In particular, this allows us to have
an activity that is using fitSystemWindows to have the content
of its UI extend out to the visible content part of the screen
while still positioning its fixed UI elements inside the
standard content rect (and the entire window extending all
the way into the overscan area to fill the screen as desired).

Okay, maybe that is not written so clearly.  Well, it made
my head hurt too, so suffer!

The key thing is that windows now need to know about three
rectangles: the overall rectangle of the window, the rectangle
inside of the overscan area, and the rectangle inside of the
content area.  The FLAG_LAYOUT_IN_OVERSCAN option controls
whether the second rectangle is pushed out to fill the entire
overscan area.

Also did some improvements to debug dumping in the window
manager.

Change-Id: Ib2368c4aff5709d00662c799507c37b6826929fd
 2013-02-22 19:14:37 -08:00
Jason Sams
460fdd427c Merge "add support for debug and profile contexts." 2013-02-23 02:44:49 +00:00