drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,280 Commits 1 Branch 0 Tags
Commit Graph

206280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
73ea8117b0 am 0a9b6a52: am 5d21f416: Merge "Dispatch onUserSwitched callbacks on handler thread" into mnc-dev 
* commit '0a9b6a52d75543dc3508daa6ce1dd131fb90296b':
  Dispatch onUserSwitched callbacks on handler thread
 2015-07-09 18:50:50 +00:00
Christopher Tate
d3b8da4b8f am be4898f2: am 5548f983: am e6991a13: am 607a040d: Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev 
* commit 'be4898f26eadee7e9e95e31ce03ce20afb18bbe9':
  Add a mechanism for products to specify default active app linkages
 2015-07-09 18:50:37 +00:00
Alan Viverette
b5491bcc2f am 6bd2e985: am 5f3b4eea: am ec12d8ea: am 322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev 
* commit '6bd2e98584db1416a369760d02a4c0f18eea516d':
  Add missing break in AccessibilityEvent.eventTypeToString()
 2015-07-09 18:50:31 +00:00
Fyodor Kupolov
e766d5b067 am f1512d83: am 711fb234: am 9d650f15: am 3f511882: Merge "Check location permission/appop in getScanResults" into mnc-dev 
* commit 'f1512d830fb79b58b34b4065703673e32789e0f0':
  Check location permission/appop in getScanResults
 2015-07-09 18:50:23 +00:00
Robert Greenwalt
c3ed104c25 am 49a8822d: am 8d6620bd: am 30d822e2: am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev 
* commit '49a8822db9dcf2bc2b11a6a44179b361c1f8b86b':
  Revive NetworkInfo's SUSPENDED state.
 2015-07-09 18:50:16 +00:00
Jeff Sharkey
0720764b43 am 9fc9de3b: am 2e6fce31: am 923f55a5: am e21f6af3: am ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev 
* commit '9fc9de3b3374edddd7f3108a1b47769bf25d569e':
  Timeout when partitioning takes too long.
 2015-07-09 18:39:06 +00:00
Jeff Sharkey
d9233a0fb3 am 159efe23: am 480f0e73: am 381cf235: am cda18204: am a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev 
* commit '159efe23e652952ada23d81aa2f2e308129dffa3':
  Add grant flag support to "install-create" verb.
 2015-07-09 18:38:57 +00:00
Mikhail Naganov
5bcd81c178 am c39fb7e7: am 64a57dc1: am 4204ed96: am fa85a888: am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev 
* commit 'c39fb7e7a2ff5f75dc22bbf661a93fbe7502c993':
  Enhance documentation of WebSettings.WebSettings method
 2015-07-09 18:38:48 +00:00
Narayan Kamath
a9799a4122 am a2c444d5: am f17d77cd: am 43a2aca4: Merge "Remove @ToBeFixed from knowntags." 
* commit 'a2c444d58da50dcfd8b1ea90808e431417c41463':
  Remove @ToBeFixed from knowntags.
 2015-07-09 18:38:41 +00:00
Amith Yamasani
0a9b6a52d7 am 5d21f416: Merge "Dispatch onUserSwitched callbacks on handler thread" into mnc-dev 
* commit '5d21f4168e7e8625427eb2210e59b30bff5b3b85':
  Dispatch onUserSwitched callbacks on handler thread
 2015-07-09 18:10:20 +00:00
Christopher Tate
be4898f26e am 5548f983: am e6991a13: am 607a040d: Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev 
* commit '5548f98346ff92570cb4542abe32f7d716cfe679':
  Add a mechanism for products to specify default active app linkages
 2015-07-09 18:02:13 +00:00
Alan Viverette
6bd2e98584 am 5f3b4eea: am ec12d8ea: am 322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev 
* commit '5f3b4eeae18c646100a058dd02c4f5cdbf9f3dd1':
  Add missing break in AccessibilityEvent.eventTypeToString()
 2015-07-09 18:02:06 +00:00
Fyodor Kupolov
f1512d830f am 711fb234: am 9d650f15: am 3f511882: Merge "Check location permission/appop in getScanResults" into mnc-dev 
* commit '711fb234051e80b61a9d635d3c6a4d102a931acd':
  Check location permission/appop in getScanResults
 2015-07-09 18:02:00 +00:00
Robert Greenwalt
49a8822db9 am 8d6620bd: am 30d822e2: am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev 
* commit '8d6620bd1ce06e8312a8d9c9974fe981f9388e64':
  Revive NetworkInfo's SUSPENDED state.
 2015-07-09 18:01:53 +00:00
Jeff Sharkey
9fc9de3b33 am 2e6fce31: am 923f55a5: am e21f6af3: am ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev 
* commit '2e6fce3137df876aab597935aaaf508802d17d06':
  Timeout when partitioning takes too long.
 2015-07-09 17:59:49 +00:00
Jeff Sharkey
159efe23e6 am 480f0e73: am 381cf235: am cda18204: am a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev 
* commit '480f0e734e5b8770b7700e139b6847bfd76b56cf':
  Add grant flag support to "install-create" verb.
 2015-07-09 17:59:43 +00:00
Mikhail Naganov
c39fb7e7a2 am 64a57dc1: am 4204ed96: am fa85a888: am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev 
* commit '64a57dc1b3caffc0fedbb670f0e93b3a6ef58176':
  Enhance documentation of WebSettings.WebSettings method
 2015-07-09 17:59:37 +00:00
Narayan Kamath
a2c444d58d am f17d77cd: am 43a2aca4: Merge "Remove @ToBeFixed from knowntags." 
* commit 'f17d77cd9d4cc4ce5086ad45cfcc822d46951b99':
  Remove @ToBeFixed from knowntags.
 2015-07-09 17:57:32 +00:00
Amith Yamasani
5d21f4168e Merge "Dispatch onUserSwitched callbacks on handler thread" into mnc-dev 2015-07-09 17:56:50 +00:00
Jeff Sharkey
2e6fce3137 am 923f55a5: am e21f6af3: am ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev 
* commit '923f55a549957e4fb1edc24086ee80157e6050bf':
  Timeout when partitioning takes too long.
 2015-07-09 17:46:17 +00:00
Christopher Tate
5548f98346 am e6991a13: am 607a040d: Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev 
* commit 'e6991a130929cebabe41ff115238415eeb78865f':
  Add a mechanism for products to specify default active app linkages
 2015-07-09 17:43:24 +00:00
Alan Viverette
5f3b4eeae1 am ec12d8ea: am 322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev 
* commit 'ec12d8ea174b63442a901f64bf147d79c68d21e7':
  Add missing break in AccessibilityEvent.eventTypeToString()
 2015-07-09 17:43:18 +00:00
Fyodor Kupolov
711fb23405 am 9d650f15: am 3f511882: Merge "Check location permission/appop in getScanResults" into mnc-dev 
* commit '9d650f15162744b5b18916dbabb3fb289deb782c':
  Check location permission/appop in getScanResults
 2015-07-09 17:43:13 +00:00
Robert Greenwalt
8d6620bd1c am 30d822e2: am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev 
* commit '30d822e2bdfde4360fc072f7f4ee16c83ac9dcc8':
  Revive NetworkInfo's SUSPENDED state.
 2015-07-09 17:43:06 +00:00
Jeff Sharkey
480f0e734e am 381cf235: am cda18204: am a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev 
* commit '381cf2357db23b8554c890f27615857ed8e67256':
  Add grant flag support to "install-create" verb.
 2015-07-09 17:41:26 +00:00
Mikhail Naganov
64a57dc1b3 am 4204ed96: am fa85a888: am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev 
* commit '4204ed96bfda8aff5e1246a10b825846ebfddad9':
  Enhance documentation of WebSettings.WebSettings method
 2015-07-09 17:41:19 +00:00
Amith Yamasani
f64cb18038 Dispatch onUserSwitched callbacks on handler thread 
This avoids multiple threads calling beginBroadcast on the observers
list.

Bug: 22339693
Change-Id: I78a154415ccd17c9460b25589d46dadcdb850941
 2015-07-09 10:40:44 -07:00
Narayan Kamath
f17d77cd9d am 43a2aca4: Merge "Remove @ToBeFixed from knowntags." 
* commit '43a2aca4c279d3db8abdf4692249134fdd69bd96':
  Remove @ToBeFixed from knowntags.
 2015-07-09 17:38:46 +00:00
Jeff Sharkey
923f55a549 am e21f6af3: am ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev 
* commit 'e21f6af3b68d3fcfb2de661c100bca2f7f093d88':
  Timeout when partitioning takes too long.
 2015-07-09 17:27:12 +00:00
Todd Kennedy
056d6b0069 Allow codepath changes for new OTA packages 
When an OTA contains a new package, the system performs some gymnastics
to ensure that we use the most up-to-date version of the package in
either the system image or user directory. But, during boot, we enforce
a package's codepath will never change. This prevents a user-installed
package from ever overriding the system provide package [regardless of
version]. In this one, specific instance, we allow a package's codepath
to change.

Bug: 22179337
Change-Id: I2c29a87801fb5960ffbd2268231446895ad1868f
 2015-07-09 10:27:10 -07:00
Jeff Sharkey
381cf2357d am cda18204: am a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev 
* commit 'cda18204110cf91f41c560cab0f7332012e432e0':
  Add grant flag support to "install-create" verb.
 2015-07-09 17:27:07 +00:00
Mikhail Naganov
4204ed96bf am fa85a888: am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev 
* commit 'fa85a888a068da9bdd8dcc0d6ebcc675146c45cb':
  Enhance documentation of WebSettings.WebSettings method
 2015-07-09 17:27:02 +00:00
Christopher Tate
e6991a1309 am 607a040d: Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev 
* commit '607a040dae1b8fde0f9ea9f1723e0721f891f3dd':
  Add a mechanism for products to specify default active app linkages
 2015-07-09 17:26:18 +00:00
Alan Viverette
ec12d8ea17 am 322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev 
* commit '322fd93f888a0b42ee860398debe04b84b8b223f':
  Add missing break in AccessibilityEvent.eventTypeToString()
 2015-07-09 17:26:14 +00:00
Fyodor Kupolov
9d650f1516 am 3f511882: Merge "Check location permission/appop in getScanResults" into mnc-dev 
* commit '3f51188294a910c8985c778c7d86a909e6cbee25':
  Check location permission/appop in getScanResults
 2015-07-09 17:26:09 +00:00
Robert Greenwalt
30d822e2bd am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev 
* commit 'b091695bd9b9a87fc637751cfa2b52c8b72ce487':
  Revive NetworkInfo's SUSPENDED state.
 2015-07-09 17:26:04 +00:00
Narayan Kamath
43a2aca4c2 Merge "Remove @ToBeFixed from knowntags." 2015-07-09 17:22:14 +00:00
Christopher Tate
607a040dae Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev 2015-07-09 17:18:05 +00:00
Alan Viverette
322fd93f88 Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev 2015-07-09 17:17:37 +00:00
Fyodor Kupolov
3f51188294 Merge "Check location permission/appop in getScanResults" into mnc-dev 2015-07-09 17:14:19 +00:00
Robert Greenwalt
b091695bd9 Merge "Revive NetworkInfo's SUSPENDED state." into mnc-dev 2015-07-09 17:09:17 +00:00
Jeff Sharkey
e21f6af3b6 am ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev 
* commit 'ee4a534b7bbe95fa913473e3288787fcd1050c49':
  Timeout when partitioning takes too long.
 2015-07-09 17:07:33 +00:00
Jeff Sharkey
cda1820411 am a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev 
* commit 'a419076eab4ebf54186c5801216f611e080edf5f':
  Add grant flag support to "install-create" verb.
 2015-07-09 17:07:28 +00:00
Mikhail Naganov
fa85a888a0 am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev 
* commit 'abb8dc97586cc15fa16bab7dd80ffe02a379550f':
  Enhance documentation of WebSettings.WebSettings method
 2015-07-09 17:07:23 +00:00
Jeff Sharkey
ee4a534b7b Merge "Timeout when partitioning takes too long." into mnc-dev 2015-07-09 16:59:16 +00:00
Jeff Sharkey
a419076eab Merge "Add grant flag support to "install-create" verb." into mnc-dev 2015-07-09 16:58:47 +00:00
Narayan Kamath
e1b190c133 Remove @ToBeFixed from knowntags. 
It's used nowhere and will be deleted shortly.

Change-Id: Ie87f16cd060445c0e0ccac4e9a192ca266c92851
 2015-07-09 17:54:45 +01:00
Mikhail Naganov
abb8dc9758 Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev 2015-07-09 16:53:38 +00:00
Alan Viverette
5d3d23199d Add missing break in AccessibilityEvent.eventTypeToString() 
Bug: 22331852
Change-Id: I6f75dde0fb29715d05ef8e8b0e16c3a5a2b9d5e8
 2015-07-09 09:51:46 -07:00
Jeff Sharkey
edcdaf6463 Timeout when partitioning takes too long. 
Otherwise we leave user hanging in wizard forever, instead of
telling them that something went wrong.

Bug: 20914299
Change-Id: Ib9ff3a8c316976c6a1dfdaffa10762abbea0c229
 2015-07-09 09:45:39 -07:00