25016 Commits

Author SHA1 Message Date
Joe Onorato
1d46191d88 am b5f9b4f1: am 302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken 2010-06-09 14:47:43 -07:00
Joe Onorato
b5f9b4f15a am 302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken 2010-06-09 14:45:31 -07:00
Joe Onorato
302759c1ba Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken
* changes:
  dead code removal
  Cap the number of notifications that a given package can post.
  Move the usb mass storage notification & activity into SystemUI.apk.
  Add some disabled logging and another test case for reapplying the notification views.
2010-06-09 14:43:47 -07:00
Jeff Hamilton
fb3a35e586 Fix the build.
Change-Id: Ib633eb144277ec2598f25eac3a9cfe0f0184959e
2010-06-09 16:24:17 -05:00
Jeff Hamilton
35eef702b1 Remove the unused demo data set stuff.
Change-Id: I81f7a8118876ee7cb6c356c63b0d0613d9777d4f
2010-06-09 15:46:59 -05:00
Dianne Hackborn
1c11015ec1 Merge "Add Fragment option menu APIs." 2010-06-09 12:29:51 -07:00
Christopher Tate
ed3939fef0 am 7e8566a6: am d7f659e8: Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken 2010-06-09 12:27:58 -07:00
Christopher Tate
7e8566a66f am d7f659e8: Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken 2010-06-09 12:26:38 -07:00
Dianne Hackborn
b31e84bc45 Add Fragment option menu APIs.
Also fix up how transactions are handled so that a series of transactions
can correctly be created and committed.

Change-Id: I948ba47d49e9b2246a1958bd9eac9dd36dc5a855
2010-06-09 12:26:29 -07:00
Christopher Tate
d7f659e897 Merge "Fail gracefully if the user fails to supply necessary args to bmgr" into kraken 2010-06-09 12:25:05 -07:00
Christopher Tate
7e76ff1c40 Fail gracefully if the user fails to supply necessary args to bmgr
Fixes bug #2755355

Change-Id: I4690756bb5077a6b4bbbfb232cd852cad43cef77
2010-06-09 12:21:31 -07:00
Derek Sollenberger
1fd54720b0 Merge "Consolidate common zoom code and tighten access to some ZoomManager variables." 2010-06-09 11:51:48 -07:00
James Dong
86de46125c am 689497fb: am 457d5ae3: Fix a potential(observed sometimes) media server crash 2010-06-09 11:31:47 -07:00
James Dong
689497fbd0 am 457d5ae3: Fix a potential(observed sometimes) media server crash 2010-06-09 11:29:30 -07:00
James Dong
457d5ae3c9 Fix a potential(observed sometimes) media server crash
The problem is that we are referring an temp object returned from a function call.
When the function call returned, the temp object is gone; and thus the reference
may be invalidated.

-- rebased

bug - 2734946

Change-Id: I1993c4462df95610ca478f816adc30058af5850e
2010-06-09 11:27:03 -07:00
Derek Sollenberger
369aca27ec Consolidate common zoom code and tighten access to some ZoomManager variables.
This is a single CL in a series of CL's that is focused on moving the
zoom logic from WebView to ZoomManager.

Change-Id: I741fc34d5dd481b89f6e0b33503834c33f4fe69e
http://b/2671604
2010-06-09 14:11:59 -04:00
Joe Onorato
d956ae8b81 dead code removal
Change-Id: I4a11f027e764c92602d0429947e9ef39edd882e2
2010-06-09 09:15:25 -07:00
Joe Onorato
bd73d01a9c Cap the number of notifications that a given package can post.
Right now the number is 50, just to prevent apps that have gone completely bonkers.  I think the limit should be lower.

Change-Id: Ib2c4abf669c8b0250e5421b6d5aeb81aeb2f82ce
2010-06-09 09:15:25 -07:00
Joe Onorato
fe4f3ae33c Move the usb mass storage notification & activity into SystemUI.apk.
Also fix the notification to show properly when the runtime is restarted.

Change-Id: Id0c7ef9f9dc9c9df18428cbaa7db1703f085137e
2010-06-09 09:15:25 -07:00
Joe Onorato
d2b1f00e1e Add some disabled logging and another test case for reapplying the notification views.
Change-Id: I839d7771ab42a5d508ce7d15385f6ac6a4e3be83
2010-06-09 09:15:25 -07:00
Derek Sollenberger
293c360ffe Move pinch-to-zoom logic into ZoomManager.
This CL is one in a series of CL's that moves the zoom logic
from WebView into ZoomManager.

Change-Id: I9980dd78dbc3345d465d4f39afcfd2f025f45bcb
http://b/2671604
2010-06-09 11:53:10 -04:00
Kenny Root
5e4d9a04fd Add invariant check for stylesString size
It was possible for stylesStrings to claim to start past the end of the
data area thereby making mStringPoolSize larger than the data area.

Change-Id: Ibc4d5b429e3a388516135801c8abc3681daae291
2010-06-08 20:50:37 -07:00
Mathias Agopian
70eeab7412 am 34e5d967: am 55f8209d: Merge "allow re-targetting of surfaces" into kraken 2010-06-08 20:18:05 -07:00
Mathias Agopian
34e5d967f4 am 55f8209d: Merge "allow re-targetting of surfaces" into kraken 2010-06-08 20:15:56 -07:00
Mathias Agopian
55f8209da3 Merge "allow re-targetting of surfaces" into kraken 2010-06-08 20:14:11 -07:00
Mathias Agopian
5e14010b1f allow re-targetting of surfaces
Surfaces can now be parcelized and sent to remote
processes. When a surface crosses a process
boundary, it looses its connection with the
current process and gets attached to the new one.

Change-Id: I39c7b055bcd3ea1162ef2718d3d4b866bf7c81c0
2010-06-08 20:10:02 -07:00
Konstantin Lopyrev
c857740f24 Adding support for minimum number of non letter characters.
Change-Id: If54cb7209d65eef826d474d7e0dbbef63d2f2b47
2010-06-08 19:06:11 -07:00
Adam Powell
db479c9af0 Merge "Dropdown mode for ActionBar; style and API updates" 2010-06-08 17:27:09 -07:00
Jim Miller
1a0ce1cc6f am db603bb5: am 3b68548d: am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 2010-06-08 16:37:12 -07:00
Jim Miller
db603bb54f am 3b68548d: am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 2010-06-08 16:35:21 -07:00
Jim Miller
3b68548da6 am 75b6a6b9: Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo
Merge commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into kraken

* commit '75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
  Fix 2737842: Disable KeguardManager API if device policy is enabled
2010-06-08 16:33:26 -07:00
Jim Miller
75b6a6b972 Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" into froyo 2010-06-08 16:31:32 -07:00
Mathias Agopian
570898098f am 37583aeb: am 1debc665: fix [2751143] Device crashes when in a text box for too long 2010-06-08 15:49:45 -07:00
Jim Miller
284b62e1b8 Fix 2737842: Disable KeguardManager API if device policy is enabled
This change adds notification to find out when the device policy
has changed.  When an admin adds or changes a policy, we get notified
and reset the state of keyguard to be enabled.

It also moves disabling keyguard into the TokenWatcher.acquired()
method to avoid disabling keyguard when a policy doesn't permit it.
This avoids reference counting issues in TokenWatcher and hence relieves
the ordering issue.

There is one remaining caveat. An application that uses KeyguardManager
to disable keyguard will need to disable keyguard again after any
policy change.

Tested:

Install and run app that disables keyguard with no admin. Result: keyguard is enabled/disabled as expected.
Enable admin and set quality = "something" after installing & running app. Result: keyguard is enabled.
Change admin password quality to "unspecified" and re-run app (per caveat). Result: keyguard is disabled.
Change admin password quality to "something" again. Result: keyguard is enabled.
Disable admin : Result: keyguard is enabled until app runs again (per caveat).

Added minor cosmetic changes after review.

Change-Id: I302f2b01446bf031f746b0f3e8b5fd7a6cc0e648
2010-06-08 15:47:52 -07:00
Mathias Agopian
37583aebc4 am 1debc665: fix [2751143] Device crashes when in a text box for too long 2010-06-08 15:47:37 -07:00
Jason Sams
cbe4a73fef Merge "Begin using reflected files." 2010-06-08 15:43:57 -07:00
Mathias Agopian
1debc66521 fix [2751143] Device crashes when in a text box for too long 2010-06-08 15:40:56 -07:00
Jason Sams
e29f3e74f7 Begin using reflected files.
Change-Id: I5307a0eac9c206b85c0cf7451d3f8300134bf8e3
2010-06-08 15:40:48 -07:00
Adam Powell
a408291e22 Dropdown mode for ActionBar; style and API updates 2010-06-08 14:25:24 -07:00
James Dong
30bb8f89ad am d49c9818: am c44c4742: Merge "Remove some hard-coded encoding parameters" into kraken 2010-06-08 13:17:07 -07:00
James Dong
d49c981811 am c44c4742: Merge "Remove some hard-coded encoding parameters" into kraken 2010-06-08 13:15:47 -07:00
James Dong
c44c4742e7 Merge "Remove some hard-coded encoding parameters" into kraken 2010-06-08 13:13:26 -07:00
Romain Guy
8d49cd77df am c62c4c8b: am 804d0496: am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo 2010-06-08 13:05:31 -07:00
Romain Guy
c62c4c8be4 am 804d0496: am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo 2010-06-08 13:02:14 -07:00
Romain Guy
804d04969d am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into kraken

* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
  Add a method to hide/show a SurfaceView's surface.
2010-06-08 13:00:30 -07:00
Romain Guy
71d73a0dfc Merge "Add a method to hide/show a SurfaceView's surface." into froyo 2010-06-08 12:59:36 -07:00
Kenny Root
b209c9e2a2 Merge "Range checking for ResTable_map" 2010-06-08 12:52:57 -07:00
Kenny Root
06983bc566 Range checking for ResTable_map
Correct previous offset change and get ready for safe-iop.

Change-Id: Ib276c726f32b0711a72f47d3263eb21640e5a800
2010-06-08 12:51:49 -07:00
Brad Fitzpatrick
37d33a546b am 599f7287: am 9ac3743d: Merge "Log.wtf when databases go to be downgraded." into kraken 2010-06-08 12:40:57 -07:00
Brad Fitzpatrick
599f7287d6 am 9ac3743d: Merge "Log.wtf when databases go to be downgraded." into kraken 2010-06-08 12:38:52 -07:00