Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,681 Commits 3 Branches 0 Tags
6cb4be0aa6e28ea053cb346209644d2dabceea2f
Commit Graph

9251 Commits

Author SHA1 Message Date
Satoshi Kataoka
6cb4be0aa6 am 42802338: am 0f300c70: am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 
* commit '4280233813c22663d3e9d100cac70eaccd0d2afc':
  Support multi-user switch in TextServicesManagerService
 2012-10-04 18:08:32 -07:00
Satoshi Kataoka
4280233813 am 0f300c70: am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 
* commit '0f300c7045f150722532fd50dd78f6fcb4c4f395':
  Support multi-user switch in TextServicesManagerService
 2012-10-04 18:05:45 -07:00
Satoshi Kataoka
0f300c7045 am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 
* commit '284b20538764afe2500be6ba5b1f3a057123ffc9':
  Support multi-user switch in TextServicesManagerService
 2012-10-04 18:03:33 -07:00
Satoshi Kataoka
284b205387 Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 2012-10-04 18:01:09 -07:00
Jeff Brown
7952056c71 am b1e93505: am 25f5a71f: am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit 'b1e93505ae479c657fd2cfc21ddabadec8a03f6a':
  Allow phone to go to sleep while in call.
 2012-10-04 17:39:07 -07:00
Jeff Brown
b1e93505ae am 25f5a71f: am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit '25f5a71f31d8cb526f04c833c5b67e59369c725f':
  Allow phone to go to sleep while in call.
 2012-10-04 17:37:29 -07:00
Jeff Brown
25f5a71f31 am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 
* commit '17f36d154f1a8ebe72fc35af332f5c0069503364':
  Allow phone to go to sleep while in call.
 2012-10-04 17:35:29 -07:00
Amith Yamasani
af0e7e878f am 9893c47d: am 344e019a: am 82245c19: Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 
* commit '9893c47d331fd9dd92d845b6f1a3202cc4ed503b':
  Fix dupes in initial wallpaper selection
 2012-10-04 17:34:16 -07:00
Amith Yamasani
9893c47d33 am 344e019a: am 82245c19: Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 
* commit '344e019ace59cee49bce2e7b522ecba8e3b8f1c0':
  Fix dupes in initial wallpaper selection
 2012-10-04 17:32:48 -07:00
Jeff Brown
17f36d154f Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 2012-10-04 17:32:46 -07:00
Amith Yamasani
344e019ace am 82245c19: Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 
* commit '82245c199b2bbd2f598ce3c863eea425b4909cac':
  Fix dupes in initial wallpaper selection
 2012-10-04 17:30:49 -07:00
Amith Yamasani
82245c199b Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 2012-10-04 17:29:34 -07:00
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
Jeff Brown
93cbbb25a5 Allow phone to go to sleep while in call. 
Bug: 7279383
Change-Id: Ia05490218f40a1843507b95ff48fa07910e582d4
 2012-10-04 16:22:04 -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
Amith Yamasani
6474c4cd93 Fix dupes in initial wallpaper selection 
Bug: 7281217

Needed to load the settings for the user, in case the user was stopped.

Change-Id: I52d1f59a7681f8c4f7d3596486accb91cb840ecf
 2012-10-04 14:55:42 -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