98740 Commits

Author SHA1 Message Date
Dianne Hackborn
0798149082 Fix bug where we could get stuck repeatedly launching an activity.
A previous change to avoid losing activities if their process
happens to be gone at the point of launch (by counting that
activity as having its state saved) has resulted in a problem
where an activity that crashes during launch will be repeatedly
relaunched.

This is fixed here by explicitly keeping track of our attempts
to launch the activity since it was last able to save its state,
and not keeping it around if it looks like the launch is
repeatedly failing.

Change-Id: Icefd952443b7eb1222f233db95e0157fc3dd72d1
2013-01-28 11:38:26 -08:00
Dianne Hackborn
b9781fe08c Merge "App ops: you can now turn off operations." 2013-01-25 19:33:11 +00:00
Dianne Hackborn
5e45ee6752 App ops: you can now turn off operations.
Also add new ops for calendar and wi-fi scans, finish
implementing rejection of content provider calls, fix
issues with rejecting location calls, fix bug in the
new pm call to retrieve apps with permissions.

Change-Id: I29d9f8600bfbbf6561abf6d491907e2bbf6af417
2013-01-25 11:25:48 -08:00
Fergus Henderson
1c2df38242 Fix logic error in Pszczepaniak's recent change.
Also improve wording of error message.

Bug: 7666482
Change-Id: I2d2316b10fdf394bec8963327529723cbd5fbb32
2013-01-25 14:59:59 +00:00
Irfan Sheriff
526603b1d8 am 441a90dc: am 3a0acc03: am 381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (2) and others
* commit '441a90dc72d05082f0d1a4b227d48420a0b99a54':
  Fix WPS configuration method of BSS enrollee.
2013-01-24 16:15:29 -08:00
Irfan Sheriff
441a90dc72 am 3a0acc03: am 381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Android Git Automerger (1) and others
* commit '3a0acc03bb0f57df23b2c8e859acd37b80f42620':
  Fix WPS configuration method of BSS enrollee.
2013-01-24 16:12:00 -08:00
Laurent Tu
377fc095e1 Merge "Fix GpsLocationProvider.enable/disable/isEnabled" 2013-01-24 23:42:03 +00:00
Laurent Tu
7b5aeca50b Fix GpsLocationProvider.enable/disable/isEnabled
Fix the issue where GpsLocationProvider.isEnabled() returns true when it
is really false (and the other way around), when the handler hasn't
processed the enable/disable messages yet.

This can be systematically reproduced when the caller code is using the
same thread as the thread of the handler in GpsLocationProvider.

For example, this was happening in LocationManagerService.switchUser().
It would start by disabling all the providers (with
updateProviderListenersLocked()), then re-enable them in
updateProvidersLocked() only when isEnalbed()==false, which was in the
wrong state since the GpsLocationProvider.ENABLE message hadn't been
processed yet. As a result, the GpsLocationProvider was disabled upon
startup of the phone.

This is a slight problem for the enable() contract, which specifies that
getStatus() must be handled, getStatus() will be handled but might have
slighty not-up-to-date info in this case.

Bug: 8028017

Change-Id: Iff91a11cc150e9029a6db85b64a10a926e12b0ba
2013-01-24 15:26:02 -08:00
Fabrice Di Meglio
de71ce1ab3 Merge "Fix recent apps item text position in RTL mode" 2013-01-24 21:49:45 +00:00
Fabrice Di Meglio
5e3b045266 Merge "Fix SystemUI navigation bar in RTL mode" 2013-01-24 21:46:33 +00:00
Irfan Sheriff
3a0acc03bb am 381fb8bd: Merge "Fix WPS configuration method of BSS enrollee."
# By Yoshihiko Ikenaga
# Via Gerrit Code Review (1) and Yoshihiko Ikenaga (1)
* commit '381fb8bdd10e6426f829e90f57686103529adb77':
  Fix WPS configuration method of BSS enrollee.
2013-01-24 10:22:28 -08:00
Irfan Sheriff
381fb8bdd1 Merge "Fix WPS configuration method of BSS enrollee." 2013-01-24 17:38:51 +00:00
Wink Saville
36b8d75f48 am 311ef539: (-s ours) am f0bf29df: am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Android Git Automerger (2) and others
* commit '311ef539cffa35163eae64a93700ab049ceaf827':
  frameworks: Display missing text on SimUnlockScreen
2013-01-23 20:52:28 -08:00
Yoshihiko Ikenaga
1201dd9b70 Fix WPS configuration method of BSS enrollee.
Remove keypad from WPS configuration method of BSS enrollee
becuase JB UI does NOT support keypad, only supports pbc and
display.

Change-Id: I9ab6f1514805e8307b46e38261f1c657568aeb59
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2013-01-24 13:48:58 +09:00
Wink Saville
311ef539cf am f0bf29df: am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Android Git Automerger (1) and others
* commit 'f0bf29df0cff4b7e370b7c329de92e90a4bab194':
  frameworks: Display missing text on SimUnlockScreen
2013-01-23 17:37:28 -08:00
Wink Saville
f0bf29df0c am 1842f2ed: Merge "frameworks: Display missing text on SimUnlockScreen"
# By Anju Mathapati
# Via Anju Mathapati (1) and Gerrit Code Review (1)
* commit '1842f2ed745af0d0f8cc457d448ba552e40a6b34':
  frameworks: Display missing text on SimUnlockScreen
2013-01-23 17:32:38 -08:00
Wink Saville
1842f2ed74 Merge "frameworks: Display missing text on SimUnlockScreen" 2013-01-24 00:39:38 +00:00
Adam Powell
7195c8f25b am a41f9cfb: am 53d49f17: am 17f05497: am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Android Git Automerger (3) and others
* commit 'a41f9cfbbd1d137bf1baab49e0d453a40a0ecd33':
  Touch action bar title text: you will go to space today!
2013-01-23 15:52:28 -08:00
Adam Powell
a41f9cfbbd am 53d49f17: am 17f05497: am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit '53d49f1702df41a4ca342a1df6e720b16e094797':
  Touch action bar title text: you will go to space today!
2013-01-23 15:48:52 -08:00
Adam Powell
53d49f1702 am 17f05497: am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '17f05497be90004c0263c6de173af8c19ece07b0':
  Touch action bar title text: you will go to space today!
2013-01-23 15:46:20 -08:00
Adam Powell
17f05497be am c2469500: Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit 'c246950043c4c48beb51d5b56d94473e77c5fad2':
  Touch action bar title text: you will go to space today!
2013-01-23 15:44:47 -08:00
Adam Powell
c246950043 Merge "Touch action bar title text: you will go to space today!" into jb-mr1.1-dev 2013-01-23 23:42:36 +00:00
Adam Powell
7868d748ad am ae041ce8: am ce2f911d: am 65083049: am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Android Git Automerger (3) and others
* commit 'ae041ce83d32c7b34d7c513e077165764e97871d':
  Prevent simultaneous interaction with action bar and content
2013-01-23 15:31:15 -08:00
Adam Powell
ae041ce83d am ce2f911d: am 65083049: am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit 'ce2f911d87927850337dcedda39364d59bd4a7ff':
  Prevent simultaneous interaction with action bar and content
2013-01-23 15:29:02 -08:00
Adam Powell
ce2f911d87 am 65083049: am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '650830491868b961e98c1837fb4b4ce7917783b5':
  Prevent simultaneous interaction with action bar and content
2013-01-23 15:25:50 -08:00
Adam Powell
6508304918 am 5a32ec32: Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev
# Via Adam Powell (1) and Android (Google) Code Review (1)
* commit '5a32ec323784ad7926bb9dc3b3678c9b60d3a4ba':
  Prevent simultaneous interaction with action bar and content
2013-01-23 15:24:18 -08:00
Adam Powell
5a32ec3237 Merge "Prevent simultaneous interaction with action bar and content" into jb-mr1.1-dev 2013-01-23 23:20:57 +00:00
Adam Powell
27cba38952 Touch action bar title text: you will go to space today!
Title/subtitle text in an action bar is now a full alias for home/up.

Add some prototype ActionBar functionality around titles for future
API consideration.

Bug 7966136

Change-Id: I14377121dcb976d0a5f1e1862f35c3d267eb5458
2013-01-23 15:14:31 -08:00
Dianne Hackborn
d8ba6cc921 Merge "Add new API to propagate contextual data to the assist action" 2013-01-23 22:47:57 +00:00
Dianne Hackborn
51ff575d1b Merge "Fix issue #7649720: ANR occur when OTA with lower version..." 2013-01-23 22:46:01 +00:00
Dianne Hackborn
846dda3fa7 Merge "Add new disabled state for "optional" built-in apps." 2013-01-23 22:43:11 +00:00
Dianne Hackborn
f9c5e0fe83 Add new API to propagate contextual data to the assist action
When launching an assist, we have a new API allowing the
current foreground activity/application to provide additional
arbitrary contextual information that is stuffed in the
assist intent before it is launched.

Change-Id: I0b2a6f5a266dc42cc0175327fa76774f814af3b4
2013-01-23 14:39:13 -08:00
Adam Powell
d28f30a9e0 Prevent simultaneous interaction with action bar and content
Bug 8034744

Change-Id: I72cf4f5d2443e1cd6e40785b4d06d9bd363ab3e4
2013-01-23 14:23:06 -08:00
Baligh Uddin
00dcbf8f58 Merge "Import translations. DO NOT MERGE" 2013-01-23 22:15:52 +00:00
Winson Chung
79703fa00c Merge "Cleaning up listeners and AsyncTasks." 2013-01-23 22:08:37 +00:00
Baligh Uddin
455bf078cd Import translations. DO NOT MERGE
Change-Id: Ibe1bebc4f75eb892503bb29519aa62574aa82c7e
Auto-generated-cl: translation import
2013-01-23 10:04:41 -08:00
Wink Saville
d0c4ce4c3d am 24dbdc7d: am 23d85a91: am d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid."
* commit '24dbdc7d0e1e20b5c598561e7f5ed9c4dd335b7b':
  Telephony: Consider EVDO ecio zero value as valid.
2013-01-23 09:44:04 -08:00
Wink Saville
24dbdc7d0e am 23d85a91: am d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid."
* commit '23d85a911e46ac00ecaf146ca729aa3a46d17f59':
  Telephony: Consider EVDO ecio zero value as valid.
2013-01-23 09:42:03 -08:00
Wink Saville
23d85a911e am d84d289f: Merge "Telephony: Consider EVDO ecio zero value as valid."
* commit 'd84d289f443f5799fb1a81432428703dadb026dd':
  Telephony: Consider EVDO ecio zero value as valid.
2013-01-23 09:38:19 -08:00
Wink Saville
d84d289f44 Merge "Telephony: Consider EVDO ecio zero value as valid." 2013-01-23 17:15:59 +00:00
Christopher Tate
7b3b2cfc29 am e93ca308: am 0e95685f: am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit 'e93ca308c8792b231ec921ba8a00e6c78e87f9ad':
  Fix array index oob in Matrix3f.loadRotate().
2013-01-22 18:45:50 -08:00
Christopher Tate
e93ca308c8 am 0e95685f: am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit '0e95685ff49c4d189464170cc03d2d74f23da475':
  Fix array index oob in Matrix3f.loadRotate().
2013-01-22 18:42:40 -08:00
Christopher Tate
0e95685ff4 am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit 'b5a7204313447101ad80c0c6015e930f1e6b1013':
  Fix array index oob in Matrix3f.loadRotate().
2013-01-22 18:39:55 -08:00
Dianne Hackborn
c4d27a7d55 Fix issue #7649720: ANR occur when OTA with lower version...
...of Play Store is included

The issue is that the name of the play store apk on the system
image has changed, and the package manager has a bug when this
happens and it is being hidden by an updated version of the
application that is still a newer version.  In this case it
doesn't do the normal scan of the system apk, but just leaves
its old disabled state.  However if the code path has changed,
this will trip up other code that thinks the system apk has
disappeared (since when it checks for the existence of the apk
with the stored code path, it doesn't find anything).

The fix here is to add a special case to make sure the code
path is updated even if we are otherwise ignoring the hidden
system image package data.

Change-Id: Ic5118f94c078da7a30b53b9cadf7c9844f7ba866
2013-01-22 18:30:17 -08:00
Christopher Tate
b5a7204313 Merge "Fix array index oob in Matrix3f.loadRotate()." 2013-01-23 01:49:59 +00:00
Jeff Sharkey
56dc0e02fc Merge "Tests to assert correct January behavior." 2013-01-23 01:35:21 +00:00
Jeff Sharkey
1539905b46 Tests to assert correct January behavior.
Change-Id: I162102b6f1b892b79e2f5b96cb0184abb85d00bc
2013-01-22 17:32:53 -08:00
Dianne Hackborn
fd7adedebf Add new disabled state for "optional" built-in apps.
The disabled state allows you to make an app disabled
except for whatever parts of the system still want to
provide access to them and automatically enable them
if the user want to use it.

Currently the input method manager service is the only
part of the system that supports this, so you can put
an IME in this state and it will generally look disabled
but still be available in the IME list and once selected
switched to the enabled state.

Change-Id: I77f01c70610d82ce9070d4aabbadec8ae2cff2a3
2013-01-22 17:10:23 -08:00
Baligh Uddin
6c6317a8ca Merge "Import translations. DO NOT MERGE" 2013-01-23 00:33:36 +00:00
Wink Saville
40c8c770e6 Merge "Add debug and some cleanup" 2013-01-23 00:24:47 +00:00