Victoria Lease
e44d6855db
am 768ad29b: am fddea604: am dfc8e799: Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev
...
* commit '768ad29b9dd120d30ae0b28e2ad30ba3006dea3c':
Handle other providers in isAllowedProviderSafe()
2012-10-04 17:20:18 -07:00
Victoria Lease
768ad29b9d
am fddea604: am dfc8e799: Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev
...
* commit 'fddea6042eddf6c54d30fd313f9f317f6b33ef5e':
Handle other providers in isAllowedProviderSafe()
2012-10-04 17:17:34 -07:00
Victoria Lease
fddea6042e
am dfc8e799: Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev
...
* commit 'dfc8e799ed7500c1a07d4ba1f72e77d3de0f803a':
Handle other providers in isAllowedProviderSafe()
2012-10-04 17:14:45 -07:00
Victoria Lease
dfc8e799ed
Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev
2012-10-04 17:11:42 -07:00
Robert Greenwalt
b51dd7b3cd
am ca6a2c34: am 0d1bd191: am 7fd1386b: Merge "Properly cancel Tether notification." into jb-mr1-dev
...
* commit 'ca6a2c34538a8691d259bdc935c611bda7407532':
Properly cancel Tether notification.
2012-10-04 16:58:39 -07:00
Victoria Lease
cd6cee171b
am 50d849ed: am 9c681698: am a9afaccf: Merge "multiuser support for LocationBlacklist" into jb-mr1-dev
...
* commit '50d849ed8970977e2bb65fdd482f9be2a4af8491':
multiuser support for LocationBlacklist
2012-10-04 16:57:00 -07:00
Robert Greenwalt
ca6a2c3453
am 0d1bd191: am 7fd1386b: Merge "Properly cancel Tether notification." into jb-mr1-dev
...
* commit '0d1bd1911e3fe470a4da5fd82ba602c6c3cc8944':
Properly cancel Tether notification.
2012-10-04 16:56:06 -07:00
Victoria Lease
50d849ed89
am 9c681698: am a9afaccf: Merge "multiuser support for LocationBlacklist" into jb-mr1-dev
...
* commit '9c6816981f9b4919e97dc3e5489efd7d94e9a33a':
multiuser support for LocationBlacklist
2012-10-04 16:54:22 -07:00
Robert Greenwalt
0d1bd1911e
am 7fd1386b: Merge "Properly cancel Tether notification." into jb-mr1-dev
...
* commit '7fd1386b8a2b30669e0ffe0bacf17dd1feb5dba5':
Properly cancel Tether notification.
2012-10-04 16:53:25 -07:00
Victoria Lease
9c6816981f
am a9afaccf: Merge "multiuser support for LocationBlacklist" into jb-mr1-dev
...
* commit 'a9afaccf303da2b57a47ad16cca559e87e649d15':
multiuser support for LocationBlacklist
2012-10-04 16:51:43 -07:00
Robert Greenwalt
7fd1386b8a
Merge "Properly cancel Tether notification." into jb-mr1-dev
2012-10-04 16:50:40 -07:00
Victoria Lease
a9afaccf30
Merge "multiuser support for LocationBlacklist" into jb-mr1-dev
2012-10-04 16:49:15 -07:00
Robert Greenwalt
3cab6b0f1d
Properly cancel Tether notification.
...
When we add a second type of tethering we unify the notifications
into a single generic type. This is done by canceling the first
and replacing it, but this flow was improperly canceling, so
you could end up with orphaned tethering icons.
bug:7283605
Change-Id: I1d136f51592b4326d48578cf67b69122e45d4984
2012-10-04 16:44:26 -07:00
Laurent Tu
941221c157
Handle other providers in isAllowedProviderSafe()
...
Add a case for isAllowedProviderSafe() to handle providers that are not
GPS/Passive/Network/Fused. For example, this is useful for mock
providers.
Bug: 7047435
Change-Id: If4799aa90a5338889c47582d45cbfc25772c9c53
2012-10-04 15:18:05 -07:00
Svetoslav Ganov
e372f512a7
Merge "Prevent out of range magnification scale to be persisted."
2012-10-04 13:12:44 -07:00
Svetoslav Ganov
d427109b17
Prevent out of range magnification scale to be persisted.
...
1. If a bad magnification scale is persisted, i.e. it is
not between the min and max, the screen magnifier gets
into a bad state which even a reboot does not fix since
the scale is persisted in settings.
This change ensures that only valid scales are presisted.
In general a bad value should not be attempted to be
persisted but at this point this is the safest change.
bug:7288239
Change-Id: I3e9c7c091772fa64128ab8403c2127ce65cb94b8
2012-10-04 13:02:12 -07:00
Dianne Hackborn
8f5a94d938
am a718bc86: am 7df202e2: am 8a229195: Merge "Fix issue #6968859 : home not exiting an ANR\'d dream" into jb-mr1-dev
...
* commit 'a718bc863aafd21a2bc7240974ca2a51d6af92cf':
Fix issue #6968859 : home not exiting an ANR'd dream
2012-10-04 12:48:13 -07:00
Dianne Hackborn
a718bc863a
am 7df202e2: am 8a229195: Merge "Fix issue #6968859 : home not exiting an ANR\'d dream" into jb-mr1-dev
...
* commit '7df202e27a34bc1dc8832e4521a2189279de2030':
Fix issue #6968859 : home not exiting an ANR'd dream
2012-10-04 12:45:23 -07:00
Dianne Hackborn
7df202e27a
am 8a229195: Merge "Fix issue #6968859 : home not exiting an ANR\'d dream" into jb-mr1-dev
...
* commit '8a2291952528303d284878468fe260ec41998db3':
Fix issue #6968859 : home not exiting an ANR'd dream
2012-10-04 12:43:15 -07:00
Dianne Hackborn
8a22919525
Merge "Fix issue #6968859 : home not exiting an ANR'd dream" into jb-mr1-dev
2012-10-04 12:41:41 -07:00
Svetoslav Ganov
aaf8e5ab74
am 5ef98234: am c37dc69c: am d367b70c: Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev
...
* commit '5ef98234cff47b5119dcda6e2d10bc8e2942ca64':
Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END
2012-10-04 12:36:33 -07:00
Svetoslav Ganov
5ef98234cf
am c37dc69c: am d367b70c: Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev
...
* commit 'c37dc69ca272ef86a9bc3593ad6a65010294f7ae':
Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END
2012-10-04 12:34:32 -07:00
John Spurlock
1f34c36d65
am 13f271b4: am 4d97bc2a: am 27b3819d: Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev
...
* commit '13f271b42b56ebfeb592c6da30571ae6aeb305fd':
Reset status bar in keyguard, fix MU status bar bug.
2012-10-04 12:33:50 -07:00
Svetoslav Ganov
c37dc69ca2
am d367b70c: Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev
...
* commit 'd367b70c4ad5d8e6cdbcc0d6d429428413cd39b3':
Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END
2012-10-04 12:32:38 -07:00
Svetoslav Ganov
d367b70c4a
Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev
2012-10-04 12:31:02 -07:00
John Spurlock
13f271b42b
am 4d97bc2a: am 27b3819d: Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev
...
* commit '4d97bc2a58fcd206f77948427efd86e035a44a16':
Reset status bar in keyguard, fix MU status bar bug.
2012-10-04 12:30:50 -07:00
Amith Yamasani
a87071cbd9
am a96ae6eb: am 58b4cc4d: am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev
...
* commit 'a96ae6ebeadb111ca160968b68e51c5495cb9c23':
Read in the disable-keyguard-features flag from the XML file
2012-10-04 12:28:58 -07:00
John Spurlock
4d97bc2a58
am 27b3819d: Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev
...
* commit '27b3819df0ff3bbfb680b5bac54ef7e9b4d3aac1':
Reset status bar in keyguard, fix MU status bar bug.
2012-10-04 12:28:53 -07:00
Victoria Lease
41a2493d2c
am 51a0daa5: am f9d5a079: am 18c2b6e7: Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev
...
* commit '51a0daa522c5d9b34db64a51e79565f1c6d7a387':
throw SecurityException in isProviderEnabled()
2012-10-04 12:28:26 -07:00
John Spurlock
27b3819df0
Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev
2012-10-04 12:26:18 -07:00
Dianne Hackborn
5fe7e2a304
Fix issue #6968859 : home not exiting an ANR'd dream
...
Add a new call to the activity manager for the input dispatcher
to report about any pid having an ANR. This has a new feature
where it can also tell the activity manager that it is above the
system alert layer, so the activity manager can pop its ANR dialog
on top of everything if it needs to. (Normally we don't want
these dialogs appearing on top of the lock screen.)
Also fixed some debugging stuff here and there that was useful
as I was working on this -- windows now very clearly include
their uid, various system dialogs now have titles so you know
what they are in the window manager, etc.
Change-Id: Ib8f5d29a5572542cc506e6d338599ab64088ce4e
2012-10-04 12:04:58 -07:00
Amith Yamasani
a96ae6ebea
am 58b4cc4d: am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev
...
* commit '58b4cc4d2206ba0df9ed0931f1acce2058c5acea':
Read in the disable-keyguard-features flag from the XML file
2012-10-04 11:59:59 -07:00
Amith Yamasani
58b4cc4d22
am dcf5a663: Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev
...
* commit 'dcf5a663cdec5ed1aa6b5d583cdac177a0974fcb':
Read in the disable-keyguard-features flag from the XML file
2012-10-04 11:58:11 -07:00
Amith Yamasani
dcf5a663cd
Merge "Read in the disable-keyguard-features flag from the XML file" into jb-mr1-dev
2012-10-04 11:56:29 -07:00
John Spurlock
4e6922d89e
Reset status bar in keyguard, fix MU status bar bug.
...
Two things going on here, status bar disabled flags need to be reset
on user switch. Also make status bar's internal disable-record lookup
multi-user aware.
Bug:7278793
Change-Id: I1d7088d956a065330736da4c09cc1874c528c133
2012-10-04 14:51:51 -04:00
Victoria Lease
51a0daa522
am f9d5a079: am 18c2b6e7: Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev
...
* commit 'f9d5a079c58a540c307cfe3a2dedb3e8bbd8513d':
throw SecurityException in isProviderEnabled()
2012-10-04 11:22:44 -07:00
Victoria Lease
f9d5a079c5
am 18c2b6e7: Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev
...
* commit '18c2b6e730f6d639421e45328f4fb2514683efe5':
throw SecurityException in isProviderEnabled()
2012-10-04 11:20:55 -07:00
Victoria Lease
18c2b6e730
Merge "throw SecurityException in isProviderEnabled()" into jb-mr1-dev
2012-10-04 11:18:14 -07:00
Amith Yamasani
7077b3c9bb
Read in the disable-keyguard-features flag from the XML file
...
Bug: 7283501 Exchange Services crash while using Email App after upgrading
Change-Id: I40d13f5d3805ea3139dc3938077a5265ff78c426
2012-10-04 11:00:55 -07:00
Victoria Lease
83762d22c9
multiuser support for LocationBlacklist
...
This allows primary/secondary users to have different "Google
Location Services" preferences. It also reenables LocationBlacklist,
which is fixed elsewhere.
Bug: 7213502
Bug: 7248239
Change-Id: I94837682f95920c225c00b7da2de6dd1418a673e
2012-10-04 09:46:52 -07:00
John Spurlock
8fdce01621
am 4ab6d62c: am 220b7d0e: am 1205d16e: Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev
...
* commit '4ab6d62c350c40f25a0471928198050fdd68b62f':
Clear notifications properly on ACTION_USER_STOPPED.
2012-10-04 09:14:53 -07:00
John Spurlock
4ab6d62c35
am 220b7d0e: am 1205d16e: Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev
...
* commit '220b7d0ee221b2517189e0fc4c60c77e162b9b36':
Clear notifications properly on ACTION_USER_STOPPED.
2012-10-04 09:12:55 -07:00
John Spurlock
220b7d0ee2
am 1205d16e: Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev
...
* commit '1205d16e020beeb16f05e0d788fdf7ed478623f6':
Clear notifications properly on ACTION_USER_STOPPED.
2012-10-04 09:11:17 -07:00
John Spurlock
078a490c22
Clear notifications properly on ACTION_USER_STOPPED.
...
Which also takes care of the ACTION_USER_REMOVED case.
Bug:7277853
Change-Id: I0a6bade11bd0d420df03e16e69a386cfccfa07cc
2012-10-04 12:00:53 -04:00
Victoria Lease
f429921e3a
throw SecurityException in isProviderEnabled()
...
In MR0, we did not allow applications to query enabled status of
location providers they did not have permission to use. Some
applications counted on this behavior, using the thrown
SecurityException to determine whether or not they have permission
to use the specified provider.
Reverting to this behavior fixes the regressions seen in those
applications.
Bug: 7251459
Change-Id: I8b0cfd5862c80f0c831a4ab544c3fa7408bc84a0
2012-10-04 08:01:19 -07:00
Svetoslav Ganov
f068fed6c4
Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END
...
1. The initial implementation was not sending the gesture start and end
events until the the user has moved more than a given slop and did not
do it faster than a given velocity. However, there is the case where
if the user did not move or just taped on the screen an exploration
occurs. The system was not sending the exploration start and end
events for the latter case.
2. The delaued command for long press was not canceled when the pointer
moves more than the slop distance.
bug:7282811
Change-Id: I7d98470cd4d9ea9b2519326e5e550ff68b040747
2012-10-03 22:48:11 -07:00
Satoshi Kataoka
feb750e729
am 580bb919: am faf45d25: am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev
...
* commit '580bb919ed61d22de018f5cb0df68ae566c01843':
Close the current input method when attached view doesn't have a handler
2012-10-03 21:08:51 -07:00
Satoshi Kataoka
580bb919ed
am faf45d25: am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev
...
* commit 'faf45d2525bf64fa7f484cde9180c448fd0e0345':
Close the current input method when attached view doesn't have a handler
2012-10-03 21:06:57 -07:00
Satoshi Kataoka
faf45d2525
am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev
...
* commit 'ebf7e2851cab55348153fca299c52042b125924d':
Close the current input method when attached view doesn't have a handler
2012-10-03 21:05:12 -07:00
Satoshi Kataoka
ebf7e2851c
Merge "Close the current input method when attached view doesn't have a handler" into jb-mr1-dev
2012-10-03 21:02:20 -07:00