Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,963 Commits 3 Branches 0 Tags
ea3b4506f3774032af8652d7cc458cd3ba73ef92
Commit Graph

12328 Commits

Author SHA1 Message Date
Yuhao Zheng
3cb31ed094 am 69ea6665: am af672998: Merge "Fix Settings app crash while enabling tethering" into klp-dev 
* commit '69ea666520af496b6cd1c106df727d74be70c491':
  Fix Settings app crash while enabling tethering
 2013-09-16 13:42:36 -07:00
Yuhao Zheng
69ea666520 am af672998: Merge "Fix Settings app crash while enabling tethering" into klp-dev 
* commit 'af672998af7fb0bba90f7d56504584a63ff189fa':
  Fix Settings app crash while enabling tethering
 2013-09-16 13:39:35 -07:00
Yuhao Zheng
af672998af Merge "Fix Settings app crash while enabling tethering" into klp-dev 2013-09-16 20:36:50 +00:00
Vinit Deshapnde
998c7007d1 am 664b5df7: am 7354b834: Merge "Fix an NPE in WifiService" into klp-dev 
* commit '664b5df781c2ee7784800a9d86c5ee33edeb512c':
  Fix an NPE in WifiService
 2013-09-16 13:31:51 -07:00
Vinit Deshapnde
664b5df781 am 7354b834: Merge "Fix an NPE in WifiService" into klp-dev 
* commit '7354b834fc53a9d1885553aea58f632df16a5655':
  Fix an NPE in WifiService
 2013-09-16 13:29:05 -07:00
Yuhao Zheng
8c461c6fc6 Fix Settings app crash while enabling tethering 
While enabling Portable Wifi hotspot in Settings, a null WifiConfiguration
is provided. This null config is on purpose and meanful, and it should bypass
the validation test to avoid the NullPointerException.

Bug: 10780414

Change-Id: Ic507ecae463946c925b3d5fb5a1d185b37db410f
 2013-09-16 13:24:04 -07:00
Vinit Deshapnde
ffec332727 Fix an NPE in WifiService 
The check to validate incoming configurations is flagging a correct
API usage as well - which doesn't provide any configuration to test.
Fixing code to accommodate this.

Bug: 10749041

Change-Id: I972f0edbdfa14aaa3edb34e4c6784b436c288383
 2013-09-16 12:41:12 -07:00
Matthew Williams
86f4b37d19 Merge "Refactor SyncManager rename authority->target" 2013-09-16 18:29:36 +00:00
Christopher Tate
0a7b5eaf0f am 88b24415: am 06dc8484: Fix handling of privileged permissions on update 
* commit '88b244151a7d870d9a4cbca8d8e5abb3c5c1dfac':
  Fix handling of privileged permissions on update
 2013-09-15 18:54:52 -07:00
Christopher Tate
88b244151a am 06dc8484: Fix handling of privileged permissions on update 
* commit '06dc8484b4bf4028eed1e289b1d441eecaa22edf':
  Fix handling of privileged permissions on update
 2013-09-15 18:51:43 -07:00
Christopher Tate
06dc8484b4 Fix handling of privileged permissions on update 
When a bundled app is upgraded, only reprocess ungranted 'system'
permissions if the bundled apk is privileged.

Also adds the 'privileged' flag to the dumpsys flag summary.

Bug 10503183

Change-Id: Ic6560fc904e5970fc871a155c898744a6607f851
 2013-09-15 17:51:04 -07:00
Craig Mautner
042634cc48 am e932a69f: am dc333542: Merge "Add debug logging for b/10689184." into klp-dev 
* commit 'e932a69f162e3205c8a28e9521bf9ccb9e495ce0':
  Add debug logging for b/10689184.
 2013-09-15 14:52:29 -07:00
Craig Mautner
e932a69f16 am dc333542: Merge "Add debug logging for b/10689184." into klp-dev 
* commit 'dc3335429acf184cf67d022de6fe286c3672663a':
  Add debug logging for b/10689184.
 2013-09-15 14:50:39 -07:00
Craig Mautner
dc3335429a Merge "Add debug logging for b/10689184." into klp-dev 2013-09-15 21:47:52 +00:00
Craig Mautner
5845812780 Add debug logging for b/10689184. 
Focus is now on focus. Remove logging when fixed.

Change-Id: Ic0cd2d6bd4e65dac9dd40f4745dd12fb84f687ce
 2013-09-15 14:18:54 -07:00
Svetoslav Ganov
a6df7120f4 am b30e185b: am 4244d66a: Merge changes Id0a67846,I20b57d66 into klp-dev 
* commit 'b30e185b440e04eac5119653a2868395554febfe':
  Print system may get stuck bound to a print service
  Spooler should not crash if print service config activities are not exported.
 2013-09-15 11:50:44 -07:00
Svetoslav Ganov
b30e185b44 am 4244d66a: Merge changes Id0a67846,I20b57d66 into klp-dev 
* commit '4244d66a122258adc86a8d757d3fe5f9588a59f8':
  Print system may get stuck bound to a print service
  Spooler should not crash if print service config activities are not exported.
 2013-09-15 11:48:10 -07:00
Svetoslav Ganov
4244d66a12 Merge changes Id0a67846,I20b57d66 into klp-dev 
* changes:
  Print system may get stuck bound to a print service
  Spooler should not crash if print service config activities are not exported.
 2013-09-15 18:46:02 +00:00
Svetoslav Ganov
de4fa2dfe2 Print system may get stuck bound to a print service 
1. If a print service dies, is restarted and at the time of the
   restart the service has neither print jobs nor a discovery
   serssion it gets stuck into a bound state. Now it unbinds if
   after binding and ensuring it is in the lifecycle state right
   before the death there are no active print jobs and no discovery
   session.

   Also when a print service dies we fail all of its print jobs
   but did not update the service that all of its print jobs are
   handled, i.e. it has no active print jobs.

2. Fixed a null pointer exception in UserState

bug:10696723

Change-Id: Id0a67846093fca5d4c1e10843eaf6aa90169d942
 2013-09-15 02:58:14 -07:00
Wink Saville
8976e3473f am cf618544: am 78d0cf79: Merge "Tighten condition for calling checkMobileProvisioning." into klp-dev 
* commit 'cf6185447188a53e42ca28a73fe667e375621565':
  Tighten condition for calling checkMobileProvisioning.
 2013-09-14 11:23:28 -07:00
Wink Saville
cf61854471 am 78d0cf79: Merge "Tighten condition for calling checkMobileProvisioning." into klp-dev 
* commit '78d0cf7958dfde7951ed1a2c0317e04d6b41f4f3':
  Tighten condition for calling checkMobileProvisioning.
 2013-09-14 11:21:07 -07:00
Wink Saville
78d0cf7958 Merge "Tighten condition for calling checkMobileProvisioning." into klp-dev 2013-09-14 18:19:39 +00:00
Maggie Benthall
96b82aae35 am b964e5ed: am f5aba5ad: Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev 
* commit 'b964e5edff92849c4ade7d43b86bfaca26d2a4a4':
  CA cert monitoring: add notifications and actions for dialog
 2013-09-14 11:04:08 -07:00
Maggie Benthall
b964e5edff am f5aba5ad: Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev 
* commit 'f5aba5ad1e09829a13bd0ad4912e45ff3d773176':
  CA cert monitoring: add notifications and actions for dialog
 2013-09-14 11:02:43 -07:00
Maggie Benthall
f5aba5ad1e Merge "CA cert monitoring: add notifications and actions for dialog" into klp-dev 2013-09-14 18:00:13 +00:00
Wink Saville
127beffb05 Tighten condition for calling checkMobileProvisioning. 
Add the condition that the connected network needs to be TYPE_MOBILE.
This eliminates checking on connecting to secondary networks like
FOTA, MMS, SUPL ...

This reduces unnecessary attempts to bring up multiple connections at
the same time. Especially in the light of the trouble we're having with HFA
on Sprint, where we don't want to connect to any other network until HFA
has completed.

Bug: 10758001
Change-Id: Id294536b70304a51de4752bc1a4ffac734f10f1a
 2013-09-14 09:04:53 -07:00
Svetoslav Ganov
860f8a6b66 Spooler should not crash if print service config activities are not exported. 
1. If a print service does not export its activities for settings and
   adding printers the print spooler ignores them instead of crashing.
   Also if the service is not enabled its activities are now ignored.

2. Added a dedicated permission for a print service to optionally
   protect its settings and add printer activities such that only the
   system can bind to them.

3. Fixed a crash in the print dialog if its content is detached
   from the window and animators are running.

bug:10680224

Change-Id: I20b57d6622a15f9b2352ba78d04c44e67b316a15
 2013-09-14 01:00:55 -07:00
Matthew Williams
8ef2204c8f Refactor SyncManager rename authority->target 
fix bug that was stopping any sync service sync from
from taking place.
Change-Id: Ib3f46d43be630d4196fbf0ca32da03b6e7a6a5b9
 2013-09-13 19:22:50 -07:00
David Christie
6180e84410 am 691a3191: am 5f68f717: Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev 
* commit '691a3191e3efb11f0607c45f29e460d2baf8188e':
  Strip names out of externally supplied WorkSources to WifiManager (b/10710007).
 2013-09-13 18:10:16 -07:00
David Christie
691a3191e3 am 5f68f717: Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev 
* commit '5f68f717019433ce4fa284386ba48bd1b571073a':
  Strip names out of externally supplied WorkSources to WifiManager (b/10710007).
 2013-09-13 18:06:56 -07:00
David Christie
5f68f71701 Merge "Strip names out of externally supplied WorkSources to WifiManager (b/10710007)." into klp-dev 2013-09-14 01:02:40 +00:00
David Christie
6ab2284c98 Strip names out of externally supplied WorkSources to WifiManager (b/10710007). 
Change-Id: I69bd7ce9e942c2f9327415b2821d805e1b50a1a4
 2013-09-13 17:34:40 -07:00
Christopher Tate
c083cb719a am 5de04119: am 0f8ec44b: Merge "Prune shared users that the system declares but does not use" into klp-dev 
* commit '5de041193cec58e8ee40a62c760b24141455b2f8':
  Prune shared users that the system declares but does not use
 2013-09-13 17:32:02 -07:00
Dianne Hackborn
6cc372b16a am 0af9fb52: am 236afa0d: Merge "Fix issue #10747324: adb install hangs" into klp-dev 
* commit '0af9fb526b67ddb2d7f55dabef4379f46b622d57':
  Fix issue #10747324: adb install hangs
 2013-09-13 17:30:53 -07:00
Craig Mautner
5bb9c2edb7 am f6f36a95: am 540421ba: Merge "When launching home activity, make sure it is top." into klp-dev 
* commit 'f6f36a95a238381740a92263a76af790bc93ae37':
  When launching home activity, make sure it is top.
 2013-09-13 17:30:36 -07:00
Dianne Hackborn
1cd9a73ac0 am f3b4cf7d: am 28eeb420: Merge "Implement #10749688: Improve low memory reporting" into klp-dev 
* commit 'f3b4cf7d01b68418dd652e201868d140de081bd8':
  Implement #10749688: Improve low memory reporting
 2013-09-13 17:30:31 -07:00
Wink Saville
d80b0a9515 am 12d3f488: am 7770dcc3: Merge "checkMobileProvisioning should not block." into klp-dev 
* commit '12d3f488e79ba5afcc30bb2b4e555d06b2a34c74':
  checkMobileProvisioning should not block.
 2013-09-13 17:22:56 -07:00
Jason Monk
103a02453b am f9464838: am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 
* commit 'f9464838fe141aac1c677e2f4ec0133381fbb5af':
  Guarantee that PAC Local Proxy owns Port
 2013-09-13 17:22:53 -07:00
Christopher Tate
9b6c9a1592 am fcda3283: am 7560c256: Merge "Add hidden API for querying available \'home\' activities" into klp-dev 
* commit 'fcda3283d27f8dfaa812fb735af43eea2e077c64':
  Add hidden API for querying available 'home' activities
 2013-09-13 17:22:45 -07:00
Christopher Tate
5de041193c am 0f8ec44b: Merge "Prune shared users that the system declares but does not use" into klp-dev 
* commit '0f8ec44b13487f5726cab77eb79cac016e090b25':
  Prune shared users that the system declares but does not use
 2013-09-13 17:22:24 -07:00
Dianne Hackborn
0af9fb526b am 236afa0d: Merge "Fix issue #10747324: adb install hangs" into klp-dev 
* commit '236afa0d8b3e146c97801bd72a224b0908cd93f9':
  Fix issue #10747324: adb install hangs
 2013-09-13 17:16:13 -07:00
Craig Mautner
f6f36a95a2 am 540421ba: Merge "When launching home activity, make sure it is top." into klp-dev 
* commit '540421ba984655b07f2b70bae1db9ae1bc3052aa':
  When launching home activity, make sure it is top.
 2013-09-13 17:15:58 -07:00
Dianne Hackborn
f3b4cf7d01 am 28eeb420: Merge "Implement #10749688: Improve low memory reporting" into klp-dev 
* commit '28eeb42012018bfa3cffc77e9a970e8f5c13f70b':
  Implement #10749688: Improve low memory reporting
 2013-09-13 17:15:23 -07:00
Wink Saville
12d3f488e7 am 7770dcc3: Merge "checkMobileProvisioning should not block." into klp-dev 
* commit '7770dcc3d351a494d0f5fe44feb776cc512e9b18':
  checkMobileProvisioning should not block.
 2013-09-13 17:14:15 -07:00
Jason Monk
f9464838fe am 312c495f: Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev 
* commit '312c495f4b8d002264772f61fe1fa3ef87bf3e52':
  Guarantee that PAC Local Proxy owns Port
 2013-09-13 17:14:10 -07:00
Christopher Tate
fcda3283d2 am 7560c256: Merge "Add hidden API for querying available \'home\' activities" into klp-dev 
* commit '7560c256ecacb5fa3904ec5c957e88331328f38b':
  Add hidden API for querying available 'home' activities
 2013-09-13 17:14:00 -07:00
Christopher Tate
0f8ec44b13 Merge "Prune shared users that the system declares but does not use" into klp-dev 2013-09-14 00:11:48 +00:00
Dianne Hackborn
236afa0d8b Merge "Fix issue #10747324: adb install hangs" into klp-dev 2013-09-14 00:04:43 +00:00
Dianne Hackborn
2e46bb5d88 Fix issue #10747324: adb install hangs 
Dumb typo was clearing the wrong service array, causing
us to sometimes forget we were launching a service.

Change-Id: Ie1aba0e07d19e85a104a5985e3cead5f28a0556a
 2013-09-13 17:01:26 -07:00
Christopher Tate
86b391cd03 Prune shared users that the system declares but does not use 
Bug 10184643

Change-Id: I72c5177c621c24fac34bf8744eb6c5108b6d3464
 2013-09-13 16:58:36 -07:00