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

11154 Commits

Author SHA1 Message Date
Jim Miller
1a4ebd42e2 am cfa2d7c9: am 700a9506: am cb52cb52: Fix SDK build. 2010-06-08 10:15:27 -07:00
Jim Miller
aed22d27bb am a9a0a0b2: am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 2010-06-08 10:15:21 -07:00
Jim Miller
700a95068e am cb52cb52: Fix SDK build. 
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into kraken

* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
  Fix SDK build.
 2010-06-07 21:23:53 -07:00
Jim Miller
cb52cb5225 Fix SDK build. 
On branch fix_sdk
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   core/java/android/app/KeyguardManager.java

Change-Id: I56848db098822536f0ac32efc8f0eb1d725bf6f9
 2010-06-07 21:19:16 -07:00
Jim Miller
7d70358a03 am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 
Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into kraken

* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
  Fix 2737842: disable keyguard API when device policy is enabled.
 2010-06-07 19:25:49 -07:00
Jim Miller
d6b5705e18 Fix 2737842: disable keyguard API when device policy is enabled. 
This fix disables KeyguardManager's enable/disable API when any
device policy admin requests a policy that enforces a password.

Change-Id: Idb1da16b14ed8963142f7b1f62d2b060d84ffa65
 2010-06-07 19:19:29 -07:00
Adam Powell
1f60aaf5c5 Merge "Fix bug 2747634 - Crash on selecting wifi" 2010-06-07 15:13:47 -07:00
Dan Egnor
2782a3de2c Merge "Add support for logging curl commands for binary POST data" 2010-06-07 14:53:00 -07:00
Jaikumar Ganesh
e6692f0f69 am a182e12b: am 526f2ff1: Merge "Serialize all commands for a particular profile." into kraken 2010-06-07 14:13:24 -07:00
Jaikumar Ganesh
daa595e733 am 8984d144: am a8c2514e: Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken 2010-06-07 14:13:19 -07:00
Jaikumar Ganesh
7de1392fc8 am eee1376c: am e50ab5f9: Merge "Add a new state machine for handling the incoming / outgoing profile connections." into kraken 2010-06-07 14:13:14 -07:00
Jaikumar Ganesh
526f2ff1a5 Merge "Serialize all commands for a particular profile." into kraken 2010-06-07 14:10:08 -07:00
Jaikumar Ganesh
a8c2514edd Merge "Pass BluetoothDevice to the Bluetooth Headset calls." into kraken 2010-06-07 14:09:49 -07:00
Jaikumar Ganesh
e50ab5f94c Merge "Add a new state machine for handling the incoming / outgoing profile connections." into kraken 2010-06-07 14:09:39 -07:00
Jaikumar Ganesh
f1048cdb68 Serialize all commands for a particular profile. 
Change-Id: I843ea9ab0bb2372c8316e99e8c083a9939ad774a
 2010-06-07 14:08:38 -07:00
Dmitri Plotnikov
7e8612ae0f Merge "Contact directory (GAL) API proposal." 2010-06-07 14:01:31 -07:00
Dianne Hackborn
f8a450f62d am 7d75a66c: am b7bb3b3d: Fix bug in reporting a processes\'s dependent component. 2010-06-07 12:54:04 -07:00
Adam Powell
68464a9599 Fix bug 2747634 - Crash on selecting wifi 
Allow Spinner to call setAdapter during superclass construction.

Change-Id: Ia57d231249b28de3809d7ee09a77277eac1553ca
 2010-06-07 12:48:07 -07:00
Dianne Hackborn
b7bb3b3df6 Fix bug in reporting a processes's dependent component. 
Also add new action to show an app's details.

Change-Id: I6ad3b3ac8462f5acf726ce76130882a262adff92
 2010-06-07 11:01:29 -07:00
Evan Charlton
e4fb6264d0 Merge "Invalidate the ProgressBar when changing animation states" 2010-06-07 10:49:13 -07:00
Evan Charlton
08e1473ca3 Invalidate the ProgressBar when changing animation states 
When changing a ProgressBar from indeterminate to determinate, the display was
not being invalidated correctly and would freeze the progress bar.

Bug: 1296117
Change-Id: I2e0a9b76da919b5388f1dbc1c8f4b030355eb8ce
 2010-06-07 10:38:53 -07:00
Christopher Tate
7c5ded5d36 am 8207e2fd: am a8ebe8b3: am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo 2010-06-06 12:14:03 -07:00
Robert Greenwalt
05fefe62ee am 1bdb78c1: am 9c4ed139: am f9610b38: Merge "Make the DUN apn data secure." into froyo 2010-06-06 12:13:55 -07:00
Christopher Tate
a8ebe8b3f5 am df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo 
Merge commit 'df2e2eff9446c0220515fa7aab7857135e04e12e' into kraken

* commit 'df2e2eff9446c0220515fa7aab7857135e04e12e':
  Watchdog now records kernel stacks when it fires
 2010-06-06 12:10:08 -07:00
Robert Greenwalt
9c4ed1394b am f9610b38: Merge "Make the DUN apn data secure." into froyo 
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into kraken

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.
 2010-06-06 12:10:00 -07:00
Grace Kloba
362a255d6e Merge "Do not call AlertDialog.show() if the context is not the focused Activity. In that case, just take the default cancel." 2010-06-04 21:36:45 -07:00
Mathias Agopian
58006194f8 am f5f7d389: am fae5cb2b: optimize Surface.readFromParcel() 2010-06-04 19:17:16 -07:00
Mathias Agopian
fae5cb2b35 optimize Surface.readFromParcel() 
this is called for each relayout() and used to create a full Surface (cpp)
which in turn did some heavy work (including an IPC with surfaceflinger),
most of the time to destroy it immediatelly when the returned surface
(the one in the parcel) was the same.

we now more intelligentely read from the parcel and construct the new
object only if needed.

Change-Id: Idfd40d9ac96ffc6d4ae5fd99bcc0773e131e2267
 2010-06-04 18:57:41 -07:00
Christopher Tate
df2e2eff94 Merge "Watchdog now records kernel stacks when it fires" into froyo 2010-06-04 18:06:07 -07:00
Grace Kloba
fba3197d9e Do not call AlertDialog.show() if the context is not 
the focused Activity. In that case, just take the
default cancel.

Change JSAlert to be cancelable like JSConfirm.

Fix http://b/issue?id=2741195
 2010-06-04 17:31:33 -07:00
Vasu Nori
81b65ebc52 Merge "when database is opened, set journal_mode to TRAUNCATE" 2010-06-04 17:09:00 -07:00
Vasu Nori
f9e2bd085f when database is opened, set journal_mode to TRAUNCATE 
this journal_mode is more efficnent than the default journal_mode (DELETE)

Change-Id: I8879d3fe8dda410f4674ead9270aa7ecdaf91b5e
 2010-06-04 17:08:31 -07:00
Dianne Hackborn
e399f9d33f Merge "Fix issue #2733766: Crash in Gallery onDestroy: java.lang.RuntimeException" 2010-06-04 15:26:35 -07:00
Christopher Tate
ecaa7b41ca Watchdog now records kernel stacks when it fires 
The kernel threads are appended to the usual /data/anr/traces.txt file
and dropboxed along with the usual Dalvik stack dumps.

Change-Id: I120f1f5ee54c965efe9ac0c7f40fdef56385f1fa
NOTE: this change depends on the kernel publishing /proc/$PID/stack
 2010-06-04 14:55:02 -07:00
Dianne Hackborn
c39a5dcbe1 Fix issue #2733766: Crash in Gallery onDestroy: java.lang.RuntimeException 
Change-Id: I1c67a6603c23d15fef9a6912c86ffdf77aaa8654
 2010-06-04 14:34:29 -07:00
Adam Powell
e25d3d1ef8 Merge "Fix doc build" 2010-06-04 14:25:21 -07:00
Adam Powell
a984b38df5 Fix doc build 
Change-Id: Ia0425bc956540bbd5f16138ad182ae365bf1c85a
 2010-06-04 14:20:10 -07:00
Dianne Hackborn
d0b15cecc6 resolved conflicts for merge of f3307ae8 to master 
Change-Id: Ic59db363391f73343eba32894113914ceea5a963
 2010-06-04 14:09:02 -07:00
Adam Powell
1bba846ed1 Merge "Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner (optionally) to use it. Added associated styles." 2010-06-04 13:33:40 -07:00
Dianne Hackborn
faed5fbf15 Merge "Add support for heavy-weight applications." into kraken 2010-06-04 13:30:32 -07:00
The Android Open Source Project
eefd63e357 am 0a0c57f9: am 7c035d8a: am 2d743fe2: merge from open-source master 2010-06-04 13:02:38 -07:00
The Android Open Source Project
7c035d8a65 am 2d743fe2: merge from open-source master 
Merge commit '2d743fe2f39397d41334001d897eb78da56e94ef' into kraken

* commit '2d743fe2f39397d41334001d897eb78da56e94ef':
  Add better error handling for savePicture and restorePicture
 2010-06-04 12:58:09 -07:00
Adam Powell
c3fa6304c9 Added ListPopupWindow. Refactored AutoCompleteTextView and Spinner 
(optionally) to use it. Added associated styles.

ListPopupWindow allows apps to present a popup window of options to
the user that will correctly dodge the IME if needed.

Change-Id: I509c6c45036856daab686a6edeb7a9de1e72eb0a
 2010-06-04 12:18:16 -07:00
Vasu Nori
d2cecfd375 fix broken-test 
Change-Id: I3d33cda2e4f1ba68843d6a81b8c624ce4af8519f
 2010-06-04 12:05:58 -07:00
Robert Greenwalt
77b32ddbbe Make the DUN apn data secure. 
Rather than come out of the user-modifiable APN DB, the DUN APN data will
come first from a built-in resource and then potentially overriden by a secure
setting (which is gservices upgradable).

Also made the "require-dun" setting secure-setting overridable.
bug:2736390

Change-Id: I1e4644c3839f06c977b83797641f3948785146a2
 2010-06-04 11:13:34 -07:00
The Android Open Source Project
2d743fe2f3 merge from open-source master 
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
 2010-06-04 11:08:36 -07:00
Dianne Hackborn
860755faa6 Add support for heavy-weight applications. 
Only one can be running at a time, their process can not be killed,
and a notification is posted while it is running.

Change-Id: I843015723947e0c934ae63a1aeee139327c0bc01
 2010-06-04 10:09:13 -07:00
Jaikumar Ganesh
4a575c682b am bcc112b1: am f8acea6c: Merge "Delete local references to avoid reference table overflow." into kraken 2010-06-04 09:49:10 -07:00
Jaikumar Ganesh
f8acea6ccb Merge "Delete local references to avoid reference table overflow." into kraken 2010-06-04 09:46:03 -07:00
Alon Albert
d81689aefc Add support for logging curl commands for binary POST data 
Change-Id: Ibf55b95c2ae11681b18b20ba5643057ea0083f7f
 2010-06-04 09:39:36 -07:00