12899 Commits

Author SHA1 Message Date
Irfan Sheriff
5a55c79c55 am 169a59a8: am 63f1e2fb: Merge "Add API to control scan always mode" into jb-mr2-dev
* commit '169a59a8e2d390ff7a006dad5c54470fd284f9b0':
  Add API to control scan always mode
2013-03-20 16:03:10 +00:00
Irfan Sheriff
63f1e2fb6b Merge "Add API to control scan always mode" into jb-mr2-dev 2013-03-20 15:49:20 +00:00
Irfan Sheriff
298d93468b am 71e9d8b7: am 9f3d5505: Merge "Fix reading sleep policy" into jb-mr2-dev
* commit '71e9d8b71c2f89174b7ca7814d69874b4b2ef7ae':
  Fix reading sleep policy
2013-03-19 22:53:41 +00:00
Irfan Sheriff
9f3d55056f Merge "Fix reading sleep policy" into jb-mr2-dev 2013-03-19 22:48:13 +00:00
Irfan Sheriff
9f2e83135c Fix reading sleep policy
Bug: 8418823
Change-Id: I432b0a1a7a13dcdd834f6a1c943b06937444f406
2013-03-19 14:32:11 -07:00
Elliott Hughes
e357d2c3e1 am 291a140f: am 6d3b1338: am c9fe40ea: am 71558f1f: Merge "Fix times in debugging output to use H rather than k."
* commit '291a140fe6ffe6fcc459eff88bd14486d58cf21c':
  Fix times in debugging output to use H rather than k.
2013-03-19 17:16:50 +00:00
Elliott Hughes
6d3b13384e am c9fe40ea: am 71558f1f: Merge "Fix times in debugging output to use H rather than k."
* commit 'c9fe40ead549ff18393c0cc5c6e3bd67548f9da6':
  Fix times in debugging output to use H rather than k.
2013-03-19 10:13:34 -07:00
Nick Kralevich
b97e5eb05c am f5eaf95b: am 515c20be: Merge "PackageManagerService: honor requestedPermissionsRequired" into jb-mr2-dev
* commit 'f5eaf95bc5a3240b315376a284e6ee4a60cc5145':
  PackageManagerService: honor requestedPermissionsRequired
2013-03-19 15:50:21 +00:00
Nick Kralevich
515c20beb1 Merge "PackageManagerService: honor requestedPermissionsRequired" into jb-mr2-dev 2013-03-19 15:45:23 +00:00
Irfan Sheriff
1ef840cdc7 Add API to control scan always mode
Bug: 8141918
Change-Id: I1e5e45e514726c2cbfd86e747123e477e00fd7ed
2013-03-19 07:44:47 -07:00
Craig Mautner
8c2267d471 am c9e2239e: am aea8b0e5: am 7f7ac5b4: am fda1bff8: Merge "Correct the target app token for input method window"
* commit 'c9e2239efeddc7f22b67073e33c99e5521d31bf1':
  Correct the target app token for input method window
2013-03-19 01:56:27 +00:00
Craig Mautner
aea8b0e571 am 7f7ac5b4: am fda1bff8: Merge "Correct the target app token for input method window"
* commit '7f7ac5b4a86be479bdede226fd4a2bddcd8a9a2b':
  Correct the target app token for input method window
2013-03-18 17:50:32 -07:00
Elliott Hughes
64a277d837 Fix times in debugging output to use H rather than k.
Bug: 8359981
Change-Id: I4fccf3ed7e469b77f6e755dacbcd025005390505
2013-03-18 17:47:22 -07:00
Craig Mautner
e3cae7f1fd am 769b610e: am 2fc8ad1f: Merge "Properly close Surface when done." into jb-mr2-dev
* commit '769b610eb251554b81991c613d947208f78c493a':
  Properly close Surface when done.
2013-03-18 21:14:28 +00:00
Nick Kralevich
1cd6c6ecdf PackageManagerService: honor requestedPermissionsRequired
Don't automatically grant all normal/dangerous permissions. Instead,
check the value of requestedPermissionsRequired to see if it's required.

If the permission is not required, then only grant it if the permission
was previously granted to the application.

Change-Id: I86b1fae530c006d353f9fa22137598bc88253805
2013-03-18 13:59:04 -07:00
Craig Mautner
2fc8ad1fe6 Merge "Properly close Surface when done." into jb-mr2-dev 2013-03-18 20:57:26 +00:00
Craig Mautner
82a09210b6 Merge "Complete removal of Task from DisplayContent." 2013-03-18 19:41:45 +00:00
Craig Mautner
d5b113c947 Merge "Refactor addWindowToListInOrderLocked for clarity" 2013-03-18 19:39:32 +00:00
Craig Mautner
e3a30a0305 Merge "Start moving Tasks from DisplayContent to TaskStack" 2013-03-18 19:20:22 +00:00
Craig Mautner
e50d7fcd97 Properly close Surface when done.
Surface.destroy was not being called. Leading to warning from
StrictMode.

Fixes bug 8388527.

Change-Id: I472fb57ed2c3f6389e53d8f020f3b22b2d0740c8
2013-03-18 10:06:21 -07:00
Lorenzo Colitti
f990522f70 am 79dcd9ae: am 952e4805: Merge "Framework changes for 464xlat." into jb-mr2-dev
* commit '79dcd9ae7d35a604e2e62585c8ea247ee485d43b':
  Framework changes for 464xlat.
2013-03-18 16:47:42 +00:00
Lorenzo Colitti
952e4805f7 Merge "Framework changes for 464xlat." into jb-mr2-dev 2013-03-18 16:41:58 +00:00
Lorenzo Colitti
e98b94d590 am caee4f93: am cba45c0e: Merge "Catch RuntimeException in NMService notifications" into jb-mr2-dev
* commit 'caee4f9308965762f9ff9d81b87360dce06de6e8':
  Catch RuntimeException in NMService notifications
2013-03-18 15:49:12 +00:00
Carrie Xu
5c97184c3a Correct the target app token for input method window
The root cause is:
There is a defect in window manager service: When a new
activity that can be ime target is added into window manager
but the Z order of input method window don't need to be
changed, then the target app token of input method window
would not be updated to new one. This defect may cause that
the layer of input method window is calculated incorrectly.

The solution:
Correct the target app token for input method window.

Change-Id: I008311e3c9b1cf5fc320b614d8675c183c506d50
2013-03-18 11:45:14 +09:00
Craig Mautner
d9a22881fd Complete removal of Task from DisplayContent.
Moved Tasks into TaskStacks.

Change-Id: I3478dab4eab3a68d4d71a7a5bb2e65ba2394f2d7
2013-03-17 16:19:21 -07:00
Dianne Hackborn
d45bc55fe1 am 6acbd7c6: am bb131f52: Merge "Fix issue #8401553: It\'s possible to startForeground()..." into jb-mr2-dev
* commit '6acbd7c60a53154af3eb43e7219995c653e5fea4':
  Fix issue #8401553: It's possible to startForeground()...
2013-03-17 16:27:59 +00:00
Craig Mautner
a5eed0b8c7 Refactor addWindowToListInOrderLocked for clarity
Break up long method into three orthogonal shorter methods.

Change-Id: Ieeffd6263b84de50956f03e513f80a9264a09e43
2013-03-16 12:41:54 -07:00
Lorenzo Colitti
d9b3d55152 Catch RuntimeException in NMService notifications
Currently, NetworkManagementService only catches RemoteExceptions
when calling the BaseNetworkObserver notification methods (e.g.,
interfaceStatusChanged). However, if the observer is in the same
process, unchecked exceptions can occur as well.

When this happens, finishBroadcast does not get called, and no
further notifications can be sent, because any attempt to do so
fails with a "beginBroadcast() called while already in a
broadcast" exception.

Fix this by catching RuntimeException as well.

Bug: 8397534
Bug: 8276725
Change-Id: Icd6f32128707244978943c48a9ea3a2b952a2957
2013-03-17 03:21:35 +09:00
Craig Mautner
c00204b4d1 Start moving Tasks from DisplayContent to TaskStack
- Create new classes for Stacks on WindowManager.
- Stop using DisplayContent methods and members:
    addAppToken(),
    removeAppToken(),
    setAppTaskId(),
    removeTask(),
    mTaskIdToDisplayContents,
    mTaskIdToTask.
- Start using WindowManagerService.createTask().
- Establish hierarchy of references: AppWindowToken=>Task=>
TaskStack=>StackBox=>DisplayContent.
- Clean up StackBox, TaskStack, and Task.

Change-Id: I798990aa7966784d22f4a43822087d8bb0404dd6
2013-03-15 22:44:29 -07:00
Dianne Hackborn
bb131f52da Merge "Fix issue #8401553: It's possible to startForeground()..." into jb-mr2-dev 2013-03-16 01:59:29 +00:00
Dianne Hackborn
282add7bc3 Fix issue #8401553: It's possible to startForeground()...
...with no visible Notification

Don't allow a 0 icon resource.

Change-Id: I52e93533e6c45c6027ff3c185060cd54d087d077
2013-03-15 18:48:04 -07:00
Craig Mautner
d99b26285d am 20a402e0: am 8dfe99ce: Merge "Catch BadTokenException and continue." into jb-mr2-dev
* commit '20a402e0dc8d3052ac317e6c13afee22a9502c35':
  Catch BadTokenException and continue.
2013-03-15 19:04:20 +00:00
Craig Mautner
8dfe99ce20 Merge "Catch BadTokenException and continue." into jb-mr2-dev 2013-03-15 18:59:51 +00:00
Craig Mautner
e4bbb1cc45 Catch BadTokenException and continue.
BadTokenException is a normal consequence of swapping IMEs while there
is a DO_SHOW_SOFT_INPUT message in the IIMethodWrapper queue. This
race condition cannot be avoided without an unacceptable lock down of
InputMethodManagerService.

Fixes bug 8387663.
Fixes bug 8263462.

Change-Id: I2c21573cf972145ab08e66604cdb9344139a3f31
2013-03-15 11:38:44 -07:00
Lorenzo Colitti
3f8cbf3f61 am aa003546: am e78aa896: Merge "Set routes from stacked links as well." into jb-mr2-dev
* commit 'aa0035464b30d3ad3a758e20b1da7ffd4d4deda5':
  Set routes from stacked links as well.
2013-03-15 17:20:15 +00:00
Lorenzo Colitti
e78aa89647 Merge "Set routes from stacked links as well." into jb-mr2-dev 2013-03-15 17:14:43 +00:00
Lorenzo Colitti
13c9fdefde Framework changes for 464xlat.
1. Add a Nat464Xlat service that ConnectivityService can use
   to start and stop clat. When clat is started, the service
   waits for the clat interface to come up and then calls
   ConnectivityService to add the appropriate routes.
2. Make ConnectivityService start clat when an IPv6-only mobile
   interface is connected. We only support clat on mobile for
   now.
3. Make tethering use the interface that has the IPv4 default
   route insted of using the base interface of the
   LinkProperties. This allows us to tether to a stacked
   interface, which is needed for tethering with 464xlat.

Bug: 8276725
Change-Id: I24480af69ee280f504399062638af0836a56268e
2013-03-15 14:41:55 +09:00
Lorenzo Colitti
f83d90c667 Set routes from stacked links as well.
Currently, ConnectivityService adds and removes routes to/from
the routing table only based on the LinkProperties's routes.
Make it update routes based on the stacked links as well.

Bug: 8276725
Change-Id: I9a2adf537af5a04de0aaab3780afbcc3bb5c6acb
2013-03-15 14:35:38 +09:00
Wink Saville
5a78ba9984 am 11652313: am 33c5857c: Merge "Revert "Fail fast if somebody is adding default routes"" into jb-mr2-dev
* commit '11652313428403a6409a8120ed404b214def8cb2':
  Revert "Fail fast if somebody is adding default routes"
2013-03-15 05:12:14 +00:00
Wink Saville
33c5857c54 Merge "Revert "Fail fast if somebody is adding default routes"" into jb-mr2-dev 2013-03-15 05:07:41 +00:00
Wink Saville
7b5fd05d4e Revert "Fail fast if somebody is adding default routes"
This reverts commit 6f210bd0191e1936bbc1f036912c6efc4ea69475

Mako wouldn't boot for me, reverting for now.

Change-Id: Ie92d6bf77811e7257e86d65e1e15e1973c027cd7
2013-03-15 05:07:04 +00:00
Robert Greenwalt
654e7a199e am 6ddc39f7: am bb5b7a26: Merge "Fail fast if somebody is adding default routes" into jb-mr2-dev
* commit '6ddc39f7299c4e2494f6852f2c4171fb04230e79':
  Fail fast if somebody is adding default routes
2013-03-14 23:08:38 +00:00
Robert Greenwalt
bb5b7a2649 Merge "Fail fast if somebody is adding default routes" into jb-mr2-dev 2013-03-14 23:02:28 +00:00
Irfan Sheriff
fd5c559d63 am 370d3904: am 11aefad9: Add support for scan always available mode
* commit '370d3904f7f3360f7e2aa637795d197c84924886':
  Add support for scan always available mode
2013-03-14 21:36:33 +00:00
Irfan Sheriff
11aefad94d Add support for scan always available mode
Modify WifiService to add a controller to track the various
desired states and let the WifiStatemachine actually control
the bring up.

Bug: 8141918

Change-Id: I6e98fd5a29b43c3c50c315eff5255cd0a3eaebcd
2013-03-14 13:55:56 -07:00
Robert Greenwalt
6f210bd019 Fail fast if somebody is adding default routes
bug:2655011
Change-Id: I25da940e024825bc6e1d1ac5fe7b0d951609c1c1
2013-03-14 13:16:04 -07:00
Craig Mautner
0317f6db1a am b7ca6804: am 67bea2ef: Merge "Remove WindowManager messages from remote queue." into jb-mr2-dev
* commit 'b7ca680485f90c2507d969d7d64e5bec3acc3c33':
  Remove WindowManager messages from remote queue.
2013-03-14 16:55:12 +00:00
Craig Mautner
67bea2ef32 Merge "Remove WindowManager messages from remote queue." into jb-mr2-dev 2013-03-14 16:48:53 +00:00
Craig Mautner
ca0ac718cb Remove WindowManager messages from remote queue.
When a new IME is attached it is not enough to remove the
WindowManager messages from the local queue, but the ones in
the previous IME queue must also be removed.

Fixes bug 8263462.

Change-Id: I9e916c6052a83dc7691bcba0b6ab8328b9b7cc36
2013-03-14 09:43:02 -07:00
Mathias Agopian
9904be3570 am f2362ceb: am b1fa4f92: Merge "fix CloseGuard usage in Surface" into jb-mr2-dev
* commit 'f2362ceb50209dfb72899f9ab1b839e9238ef9a6':
  fix CloseGuard usage in Surface
2013-03-14 02:36:55 +00:00