Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
94,070 Commits 3 Branches 0 Tags
8e32da8ef024cf5dc423c5734ba93dae7ea8c8a3
Commit Graph

9820 Commits

Author SHA1 Message Date
Victoria Lease
8e32da8ef0 am 5452d232: am cee17140: am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev 
* commit '5452d2324773ac1738a1c689eef102f005a8ef87':
  make FLP play nicely with multiuser
 2012-10-29 17:14:50 -07:00
Dianne Hackborn
a5d75aec4e am 8729671c: am e1ea4d35: am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev 
* commit '8729671cc0f99a5ca03cc7b6911b2bf98a19bef1':
  Fix issue #7419050: Time is not getting updated after launching Clock
 2012-10-29 17:13:36 -07:00
Amith Yamasani
b2c07cba32 am b67f91b6: am 16f18a4c: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev 
* commit 'b67f91b672d898ae20a1e5848a37aadd33ab8167':
  Fix the user name for the owner.
 2012-10-29 17:13:29 -07:00
Victoria Lease
5452d23247 am cee17140: am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev 
* commit 'cee171409b4145876328f62823277e35387e66e4':
  make FLP play nicely with multiuser
 2012-10-29 14:23:38 -07:00
Dianne Hackborn
8729671cc0 am e1ea4d35: am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev 
* commit 'e1ea4d35d3abc05f2cd7bd961373ef164caf2a5b':
  Fix issue #7419050: Time is not getting updated after launching Clock
 2012-10-29 14:22:18 -07:00
Amith Yamasani
b67f91b672 am 16f18a4c: am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev 
* commit '16f18a4ce879c53a06cffc552a5d25e73bed5327':
  Fix the user name for the owner.
 2012-10-29 14:22:11 -07:00
Victoria Lease
cee171409b am 319c7e85: Merge "make FLP play nicely with multiuser" into jb-mr1-dev 
* commit '319c7e85019350e3a5f26c64803900b945130c3b':
  make FLP play nicely with multiuser
 2012-10-29 14:01:47 -07:00
Dianne Hackborn
e1ea4d35d3 am 8a6f6a8c: Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev 
* commit '8a6f6a8ca9824891cc841d8c6ebd72a74c7d2580':
  Fix issue #7419050: Time is not getting updated after launching Clock
 2012-10-29 13:56:01 -07:00
Amith Yamasani
16f18a4ce8 am 08482454: Merge "Fix the user name for the owner." into jb-mr1-dev 
* commit '084824548f9706db8356ed4480c282288ffc0bd0':
  Fix the user name for the owner.
 2012-10-29 13:55:57 -07:00
Victoria Lease
d50d0c31d4 don't complain about CDMA support on non-CDMA devices 
GpsLocationProvider emits a message on CDMA phones, warning about
lack of CDMA support. It also emits this message on every other
non-GSM device. I've pulled the conditions in a bit for this so that
it only happens on actual CDMA devices.

Change-Id: I1a122e2599c83c730be014c61385e60ef819b5a1
 2012-10-29 13:46:43 -07:00
Jeff Brown
266ca72300 am 46a0ec73: am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit '46a0ec73b6d4a81dd037d7beef7321f25349bf9c':
  Add MediaRouter API to get presentation display.
 2012-10-29 13:43:14 -07:00
Jeff Brown
46a0ec73b6 am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit '14012e1d1b3c96048955e22d2bb73b9c63189a54':
  Add MediaRouter API to get presentation display.
 2012-10-29 13:37:10 -07:00
Jeff Brown
14012e1d1b am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb-mr1-dev 
* commit '4e0bf7c48638f5c9b222c8781809019df0b39048':
  Add MediaRouter API to get presentation display.
 2012-10-29 13:32:02 -07:00
Victoria Lease
319c7e8501 Merge "make FLP play nicely with multiuser" into jb-mr1-dev 2012-10-26 17:32:02 -07:00
Dianne Hackborn
8a6f6a8ca9 Merge "Fix issue #7419050: Time is not getting updated after launching Clock" into jb-mr1-dev 2012-10-26 16:18:30 -07:00
Amith Yamasani
084824548f Merge "Fix the user name for the owner." into jb-mr1-dev 2012-10-26 15:54:56 -07:00
Victoria Lease
e5601ce9bf make FLP play nicely with multiuser 
Frameworks' FusedLocationProvider runs as a specific user so that it
can join a specific process. The solution that works for NLP, run one
copy per user as that user, does not work for FLP.

To make FLP play nicely with multiuser, I've allowed SYSTEM_UID to
operate in the background and included a hardcoded exception to
prevent ServiceWatcher from trying to launch one FLP per user.

Bug: 7279799
Change-Id: I573ea5226d8d00777421b39c5c3fb0899bf09b4d
 2012-10-26 15:37:18 -07:00
Dianne Hackborn
db5aca9aa6 Fix issue #7419050: Time is not getting updated after launching Clock 
Change-Id: Iaa8de2d3732bffd63fcd4fafba50955d1776611d
 2012-10-26 13:39:41 -07:00
Amith Yamasani
6f34b41114 Fix the user name for the owner. 
Use a version number to update the name to Owner, from Primary.
For new installations, use the correct localized string.

Bug: 7417150

Fix a typo in the permission description.

Bug: 7333304
Change-Id: I123741e581c6a02d4597b3cd81f2ca48a8587e2a
 2012-10-26 10:06:22 -07:00
Jeff Brown
92130f6407 Add MediaRouter API to get presentation display. 
This new API makes it possible for an application to ask on
which Display it should show a Presentation based on the currently
selected media route.

Also added a new API on DisplayManager to query displays that
support a certain category of uses.

Improved the documentation of the Presentation class to explain
how to choose an appropriate Display for presentation.

Bug: 7409073
Change-Id: Iab451215e570ae55f3718fc228303143c800fe51
 2012-10-25 20:31:21 -07:00
Svetoslav Ganov
21ab20916e am 1abaa2cb: am b8ee636a: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev 
* commit '1abaa2cb693743df9a24da265c9c6bd58991ff2c':
  Accessibility layer in inconsistent state after running UI test automation tests.
 2012-10-25 11:18:10 -07:00
Svetoslav Ganov
1abaa2cb69 am b8ee636a: am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev 
* commit 'b8ee636a864577c08a53bf4b1ba8120d952eb5d8':
  Accessibility layer in inconsistent state after running UI test automation tests.
 2012-10-25 11:15:12 -07:00
Svetoslav Ganov
b8ee636a86 am 324cfc54: Merge "Accessibility layer in inconsistent state after running UI test automation tests." into jb-mr1-dev 
* commit '324cfc54ed3527b98069f87665504a423bab63e4':
  Accessibility layer in inconsistent state after running UI test automation tests.
 2012-10-25 11:13:14 -07:00
Svetoslav Ganov
7fd9882ba3 Accessibility layer in inconsistent state after running UI test automation tests. 
1. The accessibility layer has a back door for a UI test automation code running
   from the shell to attach. The unregister code does an incorrect identity check
   and as a result the register UI test automation service is not disconnected
   until its process is killed. The fix is super safe and simple.

bug:7409261

Change-Id: I4b1da18be6c5619dadd4a58fca6724529bc59dea
 2012-10-25 09:41:11 -07:00
Jeff Brown
5e3f246189 am bf3c2898: am b21b4fdc: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev 
* commit 'bf3c28982c3b487f516b1b118944818426fc5fed':
  Dim the screen quickly in response to user activity timeout.
 2012-10-24 15:02:58 -07:00
Jeff Brown
bf3c28982c am b21b4fdc: am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev 
* commit 'b21b4fdcea2d3ff4186f4c8dbcd89493cc4fd2bf':
  Dim the screen quickly in response to user activity timeout.
 2012-10-24 15:00:31 -07:00
Jeff Brown
b21b4fdcea am 900e0ba5: Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev 
* commit '900e0ba5163bd03becf49922dfdfad07460716f0':
  Dim the screen quickly in response to user activity timeout.
 2012-10-24 14:58:26 -07:00
Jeff Brown
900e0ba516 Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev 2012-10-24 14:55:41 -07:00
Jeff Brown
5244c93176 Dim the screen quickly in response to user activity timeout. 
Reverts a previous change that made the screen dim slowly instead.
The quick transition does a better job of attracting the user's
attention to the fact that the screen is about to turn off
unless the user touches the screen.

Bug: 7386034
Change-Id: I81e4d8939f6791b96352004984a9e5b2aab79788
 2012-10-24 14:46:26 -07:00
Amith Yamasani
2f389eaff1 am 2104cdb0: am 9bf572c2: am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev 
* commit '2104cdb0e6bed1616b3a67f4b7eb3d1d6feae07b':
  Fix a crash in InputMethodManagerService due to permission failure.
 2012-10-24 13:39:01 -07:00
Amith Yamasani
2104cdb0e6 am 9bf572c2: am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev 
* commit '9bf572c2d3998977d4aef456e1c55c5d682b0bef':
  Fix a crash in InputMethodManagerService due to permission failure.
 2012-10-24 13:36:13 -07:00
Amith Yamasani
9bf572c2d3 am cd668554: Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev 
* commit 'cd668554417f089aa0ae013a29ab81864b4b4685':
  Fix a crash in InputMethodManagerService due to permission failure.
 2012-10-24 13:33:37 -07:00
Amith Yamasani
cd66855441 Merge "Fix a crash in InputMethodManagerService due to permission failure." into jb-mr1-dev 2012-10-24 13:30:01 -07:00
Christopher Tate
cd0e1c91a8 am d5d2161c: am 6eb0d777: am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev 
* commit 'd5d2161c91f4eb20087f66386a42989123354a59':
  Fix the Backup Manager's uninstall tracking
 2012-10-24 12:32:28 -07:00
Christopher Tate
d5d2161c91 am 6eb0d777: am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev 
* commit '6eb0d7770160f9adc0f5d20bbb292352494b5049':
  Fix the Backup Manager's uninstall tracking
 2012-10-24 12:29:27 -07:00
Christopher Tate
6eb0d77701 am acf5943c: Merge "Fix the Backup Manager\'s uninstall tracking" into jb-mr1-dev 
* commit 'acf5943c44d34845386afe7946aed086f8b3e87e':
  Fix the Backup Manager's uninstall tracking
 2012-10-24 12:27:46 -07:00
Christopher Tate
acf5943c44 Merge "Fix the Backup Manager's uninstall tracking" into jb-mr1-dev 2012-10-24 12:24:51 -07:00
Jeff Brown
2af7e72229 am 5bac2df4: am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 
* commit '5bac2df4d69f096fa8c858bcb3713b7af9e977f8':
  Secure windows, secure surface views and secure displays.
 2012-10-24 12:22:01 -07:00
Jeff Brown
5bac2df4d6 am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 
* commit 'b43269acddb7061c43fa6ace6a896c51a9bf4dce':
  Secure windows, secure surface views and secure displays.
 2012-10-24 12:19:59 -07:00
Jeff Brown
b43269acdd am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 
* commit '1202c43685c475158a773d03d70effa01b6bb4ff':
  Secure windows, secure surface views and secure displays.
 2012-10-24 12:17:16 -07:00
Jeff Brown
1202c43685 Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev 2012-10-24 12:14:08 -07:00
Zhihai Xu
99fc7d9c94 am 843031b0: am a656971e: am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev 
* commit '843031b03eaa062a59f467bd3e00f88d5f87adba':
  License of files Bluetooth package is not updated to ASL2
 2012-10-24 10:52:10 -07:00
Zhihai Xu
843031b03e am a656971e: am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev 
* commit 'a656971e73a09c8aa01f8a2922865ea00df43758':
  License of files Bluetooth package is not updated to ASL2
 2012-10-24 10:50:16 -07:00
Zhihai Xu
a656971e73 am 8e080d7e: Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev 
* commit '8e080d7e10dd17662750605538a9799af66494e9':
  License of files Bluetooth package is not updated to ASL2
 2012-10-24 10:48:01 -07:00
Zhihai Xu
8e080d7e10 Merge "License of files Bluetooth package is not updated to ASL2" into jb-mr1-dev 2012-10-24 10:44:16 -07:00
Dianne Hackborn
9221792e0b am e9c9a4ce: am 619eea60: am ecf4725e: Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev 
* commit 'e9c9a4ce9e9766b8950f34adeedeb7705cadf71e':
  Fix issue #7401818: Wrong transition animation when clearing task
 2012-10-24 10:36:30 -07:00
Dianne Hackborn
e9c9a4ce9e am 619eea60: am ecf4725e: Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev 
* commit '619eea609f50d85f5a7a11dace2d18feeea23c9e':
  Fix issue #7401818: Wrong transition animation when clearing task
 2012-10-24 10:34:04 -07:00
Dianne Hackborn
619eea609f am ecf4725e: Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev 
* commit 'ecf4725ef4e753a2ef08205c922391753eb3803f':
  Fix issue #7401818: Wrong transition animation when clearing task
 2012-10-24 10:31:06 -07:00
Dianne Hackborn
ecf4725ef4 Merge "Fix issue #7401818: Wrong transition animation when clearing task" into jb-mr1-dev 2012-10-24 10:28:30 -07:00
Amith Yamasani
f043de93eb Fix a crash in InputMethodManagerService due to permission failure. 
Clear calling identity before sending broadcast to the current user.

Bug: 7403829
Change-Id: If2b27d07d917b892470163e1303883b29a86c0e4
 2012-10-24 06:45:12 -07:00