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

32305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
23142acffa Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread 2010-09-27 15:23:45 -07:00
Winson Chung
55ee8f9329 am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings. 
Merge commit '44e8ff9924db43ee2470d868ce31b1c039c99b35' into gingerbread-plus-aosp

* commit '44e8ff9924db43ee2470d868ce31b1c039c99b35':
  Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
 2010-09-27 15:08:57 -07:00
Winson Chung
44e8ff9924 Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings. 
Change-Id: I15a78a5c5a18b041b1cc4a7500bd3ceccd780ea9
 2010-09-27 15:04:43 -07:00
Eric Fischer
7063eb1046 am dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 
Merge commit 'dc36da514832484f61b432291c6f5dca9f2c30bd' into gingerbread-plus-aosp

* commit 'dc36da514832484f61b432291c6f5dca9f2c30bd':
  Trim unwanted whitespace from translations.  DO NOT MERGE
 2010-09-27 15:04:35 -07:00
Eric Fischer
dc36da5148 Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 2010-09-27 15:01:33 -07:00
Nick Kralevich
b91ec410c8 squeeze a few more bits of randomness into /dev/random 
Change-Id: Ida30c33985411f353c828b43ea26ca1b7e6502af
 2010-09-27 14:49:00 -07:00
Eric Fischer
eb2746a152 Trim unwanted whitespace from translations. DO NOT MERGE 
Change-Id: I39809e844c12e283f2ed65b8fc5a6fbe14311071
 2010-09-27 14:41:54 -07:00
Jeff Brown
464fb74e28 am 9785bf0f: am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread 
Merge commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919'

* commit '9785bf0f2b6b8758aed7ded3b996a2ef0be89919':
  Add suuport for splitting touch events across windows.
 2010-09-27 14:40:38 -07:00
Joe Onorato
6d3ed72bf2 am 761427f8: am 524ae7dd: Merge "We only need at most one tty icon." into gingerbread 
Merge commit '761427f85b7b7478801dcb4e0fb2f1b824cf1268'

* commit '761427f85b7b7478801dcb4e0fb2f1b824cf1268':
  We only need at most one tty icon.
 2010-09-27 14:38:37 -07:00
Gilles Debunne
63555e36c9 am 0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 
Merge commit '0ba5b647842ab71f4b1a3080ca113eb646371d91' into gingerbread-plus-aosp

* commit '0ba5b647842ab71f4b1a3080ca113eb646371d91':
  Revert previous status bar assets. DO NOT MERGE.
 2010-09-27 14:32:06 -07:00
Gilles Debunne
0ba5b64784 Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 2010-09-27 14:26:56 -07:00
Hung-ying Tyan
7e54ef71db Move SipService out of SystemServer to phone process. 
Companion CL: https://android-git/g/#change,70187
http://b/issue?id=2998069

Change-Id: I90923ac522ef363a4e04292f652d413c5a1526ad
 2010-09-28 05:19:35 +08:00
Chris Palmer
d4f1436d6a am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design. 
Merge commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3' into gingerbread-plus-aosp

* commit '143e61097e3aa2f6fd2951c707f35c35d3be25e3':
  DO NOT MERGE Clarify the explanation of Android's security design.
 2010-09-27 14:18:15 -07:00
Alex Sakhartchouk
1121c6ce8b Merge "Error checking for MVP matrix computation. Fixing more padding bugs." 2010-09-27 14:15:39 -07:00
Vasu Nori
2953283fbd Merge "reduce synchronization on SQLiteDatabase wherever possible" 2010-09-27 14:15:08 -07:00
Joe Onorato
726e75d4d1 Merge "Merge commit 'f9f9e248' into manualmerge" 2010-09-27 14:14:47 -07:00
Joe Onorato
7ebd659dbf Merge commit 'f9f9e248' into manualmerge 
Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/StatusBarService.java
	tests/StatusBar/src/com/android/statusbartest/StatusBarTest.java

Change-Id: Ibbb2fec2d8c6f5d41398272753d271dfae698100
 2010-09-27 14:13:46 -07:00
Wu-cheng Li
191a25e1da am 83ea6389: Merge "The old overlay should be destroyed if orientation changes." into gingerbread 
Merge commit '83ea6389097570e8526a0b612051bb591186f165' into gingerbread-plus-aosp

* commit '83ea6389097570e8526a0b612051bb591186f165':
  The old overlay should be destroyed if orientation changes.
 2010-09-27 14:12:49 -07:00
Chris Palmer
143e61097e DO NOT MERGE Clarify the explanation of Android's security design. 
Assert plainly that Dalvik is not a boundary.

Certificates are for distinction, not "fake trustworthiness through
verifying cheap identities".

Clarify that UID + GID are what the kernel bases its protection on, not PID.
This is a fuzzy distinction on Android since (apart from sharedUserId and
magical system processes) there is a 1:1 mapping from process <-> UID.  But
it's important to clarify what we mean.

Clarify up front about the staticness (staticity?) of permissions. It's
explained lower down, but experience shows people don't read that far down.
Get the rationale (bad UX --> bad security) right up top.

Change-Id: I403310668d7ba42e44239055cb480c086ef76cbc
 2010-09-27 14:12:35 -07:00
Wu-cheng Li
83ea638909 Merge "The old overlay should be destroyed if orientation changes." into gingerbread 2010-09-27 14:09:02 -07:00
Vasu Nori
8fef1b7520 reduce synchronization on SQLiteDatabase wherever possible 
Change-Id: Ibb8617667752eab45d29b01d332b68c3547bdea8
 2010-09-27 14:05:09 -07:00
Gilles Debunne
bdf2d75694 Revert previous status bar assets. DO NOT MERGE. 
Change-Id: I5906a15124f7efe9b19bba18d91d6ddc089601f2
 2010-09-27 13:55:09 -07:00
Vasu Nori
ffe06127f6 remove public API setConnectionPoolSize() 
because connection pool size is now settable by modifying config.xml
of the device.

Change-Id: I973cc11d7dc10c8d95ab83e2f691068f6019fa33
 2010-09-27 13:30:49 -07:00
Kenny Root
e7dd4e38c4 am 04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread 
Merge commit '04a426f5b50a628fb73bc29b003b0e5bece17c27' into gingerbread-plus-aosp

* commit '04a426f5b50a628fb73bc29b003b0e5bece17c27':
  Use buffered I/O during certificate parsing
 2010-09-27 12:48:05 -07:00
Kenny Root
04a426f5b5 Merge "Use buffered I/O during certificate parsing" into gingerbread 2010-09-27 12:45:44 -07:00
Dianne Hackborn
a8bce7c8ac am d8691d73: Merge "Allow all apps to call ContentResolver.getType()." into gingerbread 
Merge commit 'd8691d73d158acd9ffc63748126e822afd656707' into gingerbread-plus-aosp

* commit 'd8691d73d158acd9ffc63748126e822afd656707':
  Allow all apps to call ContentResolver.getType().
 2010-09-27 12:45:31 -07:00
Dianne Hackborn
d8691d73d1 Merge "Allow all apps to call ContentResolver.getType()." into gingerbread 2010-09-27 12:42:34 -07:00
Jeff Brown
9785bf0f2b am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread 
Merge commit '14a288da6a372230d9af41da12241fe500eec837' into gingerbread-plus-aosp

* commit '14a288da6a372230d9af41da12241fe500eec837':
  Add suuport for splitting touch events across windows.
 2010-09-27 12:37:03 -07:00
Jeff Brown
14a288da6a Merge "Add suuport for splitting touch events across windows." into gingerbread 2010-09-27 12:33:14 -07:00
Guang Zhu
c18ac6ef84 Merge "skip 2d.drawImage.broken.html layout test" 2010-09-27 12:22:17 -07:00
Guang Zhu
4022d94658 skip 2d.drawImage.broken.html layout test 
this test currently blocks on some type of test devices

Change-Id: Ifacc520c441cf4142b5e6d28bde2b86728b5fc35
 2010-09-27 12:20:25 -07:00
Irfan Sheriff
798ffa1237 use hostname when address null ProxyProperties parcelling 
In ProxyProperties parcel, use toString so that hostname
is used when address is null

Change-Id: I4813dbdaf3c4a7bb404edf960d0f990c732ec0b8
 2010-09-27 12:16:11 -07:00
Hung-ying Tyan
2079843412 am 45a83a89: am fccd5bc7: Fix build. 
Merge commit '45a83a896701f61f72082f7116b85d1537ebf4cb'

* commit '45a83a896701f61f72082f7116b85d1537ebf4cb':
  Fix build.
 2010-09-27 11:57:08 -07:00
Joe Onorato
761427f85b am 524ae7dd: Merge "We only need at most one tty icon." into gingerbread 
Merge commit '524ae7dd149c6b10814282dc3e2e55a4f755ad29' into gingerbread-plus-aosp

* commit '524ae7dd149c6b10814282dc3e2e55a4f755ad29':
  We only need at most one tty icon.
 2010-09-27 11:56:29 -07:00
Joe Onorato
f9f9e248a0 am 6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some other icon." into gingerbread 
Merge commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp

* commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd':
  If an icon add remove get coalesced, don't remove some other icon.
 2010-09-27 11:56:24 -07:00
Hung-ying Tyan
45a83a8967 am fccd5bc7: Fix build. 
Merge commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f' into gingerbread-plus-aosp

* commit 'fccd5bc78f94b7dcfbcf78ddca83719c9cd1a74f':
  Fix build.
 2010-09-27 11:52:35 -07:00
Wu-cheng Li
b3347bc6d7 The old overlay should be destroyed if orientation changes. 
Previously the orientation was wrong after suspend and resume.
When the camera app is resumed behide the lock screen, it
orinteation is portrait. When users slide to unlock the screen,
surfaceChanged is called and the orientation is landscape.
The camera app stops the preview, sets the display orientation,
and starts the preview. Overlay should be destroyed if the
orientation has changed.

bug:3031640
Change-Id: I38b527f9ea78c91b538463292152c023383b4695
 2010-09-27 11:49:56 -07:00
Hung-ying Tyan
5a474a2bb8 am 44669d31: am fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread 
Merge commit '44669d31d1d5b094d7b7d3e393281440ea0c9536'

* commit '44669d31d1d5b094d7b7d3e393281440ea0c9536':
  SipAudioCall: remove SipManager dependency.
 2010-09-27 11:47:42 -07:00
Hung-ying Tyan
6cf8f64be3 am c5027642: am 025a39af: SIP: misc fixes 
Merge commit 'c5027642ff3909911d27e4abaa5e3abf1615b38d'

* commit 'c5027642ff3909911d27e4abaa5e3abf1615b38d':
  SIP: misc fixes
 2010-09-27 11:47:37 -07:00
Hung-ying Tyan
031d878682 am fe2d279c: am 00a22064: SipService: handle cross-domain authentication error 
Merge commit 'fe2d279c5ef571340f20d433badd9f68072299af'

* commit 'fe2d279c5ef571340f20d433badd9f68072299af':
  SipService: handle cross-domain authentication error
 2010-09-27 11:47:32 -07:00
Dan Morrill
2b0fa71c1a am c6581a10: am 4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details 
Merge commit 'c6581a1046b062d0e06e50e9b09e6c12a8e54efc'

* commit 'c6581a1046b062d0e06e50e9b09e6c12a8e54efc':
  Adding a feature to indicate that the device possesses low-latency audio.
 2010-09-27 11:45:51 -07:00
Joe Onorato
524ae7dd14 Merge "We only need at most one tty icon." into gingerbread 2010-09-27 11:41:24 -07:00
Joe Onorato
6fa4de3cff Merge "If an icon add remove get coalesced, don't remove some other icon." into gingerbread 2010-09-27 11:40:15 -07:00
Vasu Nori
2a06a019d1 Merge "bug:2868568 reduce the message level from error to warning" 2010-09-27 11:39:44 -07:00
Vasu Nori
f7ebe8e856 bug:2868568 reduce the message level from error to warning 
it is a rather harmless message. no need to set ERROR level
and no need to make it sound so fatal

Change-Id: I9d00563a3b869d8223cb21a98014c02535021d11
 2010-09-27 11:37:54 -07:00
Joe Onorato
a78df9f2b6 We only need at most one tty icon. 
Change-Id: Id8e2c6ba9b15ebafcf12b484f175fdaf98c1fa8a
 2010-09-27 11:36:03 -07:00
Joe Onorato
795f2840b4 If an icon add remove get coalesced, don't remove some other icon. 
Also adds a test case and turns off the extra logging we added to debug this.

Change-Id: I8640938ae4d1e75c88213177888f363e05ce0fa0
 2010-09-27 11:34:46 -07:00
Mike Lockwood
ec67253bf0 Merge "MTP: Fix local reference leaks." 2010-09-27 11:26:27 -07:00
Hung-ying Tyan
44669d31d1 am fd144d76: Merge "SipAudioCall: remove SipManager dependency." into gingerbread 
Merge commit 'fd144d7667d9d050b7fb158276ae4623d4ea83b8' into gingerbread-plus-aosp

* commit 'fd144d7667d9d050b7fb158276ae4623d4ea83b8':
  SipAudioCall: remove SipManager dependency.
 2010-09-27 11:20:35 -07:00
Hung-ying Tyan
c5027642ff am 025a39af: SIP: misc fixes 
Merge commit '025a39af346f39743c1e384b9000ce1baee36562' into gingerbread-plus-aosp

* commit '025a39af346f39743c1e384b9000ce1baee36562':
  SIP: misc fixes
 2010-09-27 11:20:30 -07:00