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

23317 Commits

Author SHA1 Message Date
Geoffrey Borggaard
79adc958e5 Fix null handling in proxies. 
ProxyInfo.getPacFileUrl() can not be null.  It will be equal to
Uri.EMPTY.  Checking for null was causing global proxies to never be
disabled.  Or more accurately, global proxies would be disabled, but
would reappear after a reboot.

ProxyInfo.getExclusionListByString() can be null.  If no
exclusion list was specified, the proxy settings would not be
successfully saved, they would disappear after reboot.

Bug: 18453223
Change-Id: I1c27e5dca5b9664bb7468ea909bff489fa110a07
 2014-11-20 19:48:20 +00:00
Jae Seo
89d8fb555a am 7edaf55a: Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 
* commit '7edaf55aab6fb14a640904015e10e2f5c9299423':
  TIF: fix setSurface() logic
 2014-11-20 18:54:52 +00:00
Jae Seo
7edaf55aab Merge "TIF: fix setSurface() logic" into lmp-mr1-dev 2014-11-20 18:51:32 +00:00
Geoffrey Borggaard
c2af9be62c am bfab323c: Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev 
* commit 'bfab323cb59f2ff4a1ed64a22a5d0c2434e302c1':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-20 18:50:38 +00:00
Geoffrey Borggaard
bfab323cb5 Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-mr1-dev 2014-11-20 18:44:49 +00:00
Dianne Hackborn
42fec57f3a am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev 
* commit 'd9968438bcf439e7a8c6058a95b85286a632dc1c':
  Fix issue with call backs from media process.
 2014-11-20 18:33:34 +00:00
Dianne Hackborn
d9968438bc Merge "Fix issue with call backs from media process." into lmp-mr1-dev 2014-11-20 18:29:15 +00:00
RoboErik
3ef3a9bff3 am ac4af18b: Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 
* commit 'ac4af18bbb077a89696260e595fc130d9c172f79':
  Handle volume events on master volume devices correctly
 2014-11-20 18:04:59 +00:00
RoboErik
ac4af18bbb Merge "Handle volume events on master volume devices correctly" into lmp-mr1-dev 2014-11-20 17:59:14 +00:00
Geoffrey Borggaard
b66252fb42 Setting ADB_ENABLED may result in a SecurityException. 
If the restriction UserManager.DISALLOW_DEBUGGING_FEATURES is enforced,
then any attempt to set ADB_ENABLED will result in a SecurityException.
This can result in the device not being able to boot.
Bug: 18433477

Change-Id: I21e4b406ad0fa89b7d4b678eac1baf212a3c7acd
(cherry picked from commit ba45b96a378623e3392da65e81e67dabdf4f0678)
 2014-11-20 15:39:23 +00:00
Wonsik Kim
b429c01558 am 59d36695: Merge "TIF: set audio gain properly" into lmp-mr1-dev 
* commit '59d3669512b4fdff262ec6fe2760c9ae967eca95':
  TIF: set audio gain properly
 2014-11-20 07:07:51 +00:00
Wonsik Kim
59d3669512 Merge "TIF: set audio gain properly" into lmp-mr1-dev 2014-11-20 07:04:25 +00:00
Wonsik Kim
102670f16a TIF: fix setSurface() logic 
Bug: 18457632
Change-Id: I8c25a355c71b5f820a1599fd365e5ae62a9a5eeb
 2014-11-20 15:09:13 +09:00
Erik Kline
90e9307e8f Rename EXTRA_NETWORK ConnectivityManager constants. 
Per b/18414703:

    s/\<EXTRA_NETWORK_REQUEST_NETWORK\>/EXTRA_NETWORK/g
    s/\<EXTRA_NETWORK_REQUEST_NETWORK_REQUEST\>/EXTRA_NETWORK_REQUEST/g

Additionally, associated string values updated to:

    android.net.extra.NETWORK
    android.net.extra.NETWORK_REQUEST

Bug: 18414703
Change-Id: I7aeed2161829742affc666e835a97ce2c28356fe
 2014-11-20 13:16:31 +09:00
Wale Ogunwale
005080e5f8 am 70273e05: Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev 
* commit '70273e05b26f671dcec9ff1aa4bafabb5e407895':
  Stop activity onVisibleBehindCanceled()
 2014-11-20 01:49:37 +00:00
Wale Ogunwale
70273e05b2 Merge "Stop activity onVisibleBehindCanceled()" into lmp-mr1-dev 2014-11-20 01:46:28 +00:00
Riley Andrews
6d354163ca [wip] Make the window animator rely on frameTime. 
The window animator is looking at cpu time difference
whilst updating animations. Using the choreographer display frame
time will be a much more consistent way of estimating
the time between frames for animation.

Change-Id: If5c4034c6e1b017749d6f4ca727d564805672c39
 2014-11-20 01:45:04 +00:00
Wonsik Kim
71dfa96f53 TIF: set audio gain properly 
Bug: 18392706
Change-Id: I56c21c156a54e7d6dcf787f6b3ab4b901843b922
 2014-11-20 09:54:36 +09:00
Wale Ogunwale
1f4c02bb18 Stop activity onVisibleBehindCanceled() 
Once an activity is no longer visible behind and has released
its background resources, it is added to the list of activities
that can be stopped, but not actually stopped until the next
major event (like another activity starting). We now schedule
the idle processing once the background resources have been
released so the activity can be stopped as soon as possible.

Bug: 18191707
Change-Id: I472eee949c1a78b4d944454463f03c90e7d2618b
 2014-11-19 16:25:51 -08:00
Wink Saville
baf21da1e1 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
 2014-11-19 16:03:09 -08:00
Dianne Hackborn
ff17024e58 Fix issue with call backs from media process. 
All but a few lines of this is for issue #16013164, which allowed
apps to do some operations as the media uid by having it call
back to them to open a file.  The problem here is with the tempory
identity stuff in the activity manager, allowing us to make the open
call as the original caller...  ideally we should figure out a way
to just get rid of all of that, but the solution here is actually
easier (even though it doesn't look it) -- we now hand a token over
to the openFile() call that it can use when doing permission checks
to say "yes I would like the check to be against whoever is responsible
for the open".  This allows us to do the uid remapping for only this
one specific set of permission checks, and nothing else.

Also fix issue #17487348: Isolated services can access system services
they shouldn't be able to.  Don't send any system service IBinder objects
down for the first initialization of an isolated process.

Change-Id: I3c70e16e0899d7eef0bae458e83958b41ed2b75e
 2014-11-19 14:29:10 -08:00
Geoffrey Borggaard
db1e7fa097 Merge "Setting ADB_ENABLED may result in a SecurityException." into lmp-dev 
automerge: e4590cf

* commit 'e4590cff5bbe581a1326abe68115b551585c43ff':
  Setting ADB_ENABLED may result in a SecurityException.
 2014-11-19 20:50:12 +00:00
Geoffrey Borggaard
ba45b96a37 Setting ADB_ENABLED may result in a SecurityException. 
If the restriction UserManager.DISALLOW_DEBUGGING_FEATURES is enforced,
then any attempt to set ADB_ENABLED will result in a SecurityException.
This can result in the device not being able to boot.
Bug: 18433477

Change-Id: I21e4b406ad0fa89b7d4b678eac1baf212a3c7acd
 2014-11-19 14:26:08 -05:00
Andres Morales
2ccf4779ad am 39843bfb: am 29db396e: am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev 
* commit '39843bfbedd0bf51ae0214869ac54e39c1126205':
  Add a checksum to FRP partition
 2014-11-19 18:26:36 +00:00
Andres Morales
39843bfbed am 29db396e: am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev 
* commit '29db396ea91651f2f17e21629f782ce4c19e0f33':
  Add a checksum to FRP partition
 2014-11-19 18:21:19 +00:00
Andres Morales
29db396ea9 am 6722598e: Merge "Add a checksum to FRP partition" into lmp-mr1-dev 
* commit '6722598ef3d23f75d244399536b2302b30388c51':
  Add a checksum to FRP partition
 2014-11-19 18:16:03 +00:00
Andres Morales
6722598ef3 Merge "Add a checksum to FRP partition" into lmp-mr1-dev 2014-11-19 18:09:53 +00:00
Jeff Sharkey
c4b41f565a am e5186c12: am 40602179: Merge "Default icon is shown after uninstalling updated priv-app" 
* commit 'e5186c12ec1c95b75d0fef1a38f94483e31aae6f':
  Default icon is shown after uninstalling updated priv-app
 2014-11-19 17:57:15 +00:00
Jeff Sharkey
e5186c12ec am 40602179: Merge "Default icon is shown after uninstalling updated priv-app" 
* commit '4060217905d805897141b028126e0aa51136cf7b':
  Default icon is shown after uninstalling updated priv-app
 2014-11-19 17:49:07 +00:00
Akira Numata
e50bc6fd29 Default icon is shown after uninstalling updated priv-app 
If updated pre-installed app is moved from "/system/app" to
"/system/priv-app" at FOTA, PackageManager does not update its
resource path correctly. This patch fixes it.

Change-Id: Iac793bcb8fd7c5bfbafd1876640b534c6da5dddf
 2014-11-19 09:57:19 +09:00
Jinsuk Kim
05691638ab am d565e033: am 0beb76e1: am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 
* commit 'd565e0337f149f044c7117935f114c0c1a99d2df':
  CEC: Use thread-safe version for avr info
 2014-11-19 00:42:54 +00:00
Jinsuk Kim
d565e0337f am 0beb76e1: am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 
* commit '0beb76e108721a009381a84bde024fc9995eeed9':
  CEC: Use thread-safe version for avr info
 2014-11-19 00:36:27 +00:00
Jinsuk Kim
0beb76e108 am 9899b663: Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 
* commit '9899b663f4c512e4a9acaa5508f0fd86bed6e476':
  CEC: Use thread-safe version for avr info
 2014-11-19 00:31:59 +00:00
Jinsuk Kim
9899b663f4 Merge "CEC: Use thread-safe version for avr info" into lmp-mr1-dev 2014-11-19 00:25:43 +00:00
Jeff Sharkey
fc162cf37c am 8bbdd1ce: am c5efb2b9: am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 
* commit '8bbdd1ce481e3a228734d1d27f9985b38a9c0f78':
  Speed up GrantUri.hashCode().
 2014-11-19 00:24:29 +00:00
Christopher Tate
e9e3c476d5 am 1f284855: am f066bf22: am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev 
* commit '1f284855fc9abffc64b80ddd5b0864e4d25f0df7':
  Prevent some alarm pathologies
 2014-11-19 00:24:18 +00:00
Rubin Xu
4221126b95 am 3c1d5e2f: am 40603baa: am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '3c1d5e2f9d0724f0a10313244d0ef47957d855f2':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:24:13 +00:00
Rubin Xu
dbf32fe93a am f978e667: am 0122db0a: am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 
* commit 'f978e667a6395902be09f3dd6c5c6b8d17ce58da':
  Fix equality test in getProfileOwnerAdmin()
 2014-11-19 00:24:09 +00:00
Jeff Sharkey
8bbdd1ce48 am c5efb2b9: am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 
* commit 'c5efb2b92a2901f71ebcab039fec24b6dd0ab927':
  Speed up GrantUri.hashCode().
 2014-11-19 00:20:50 +00:00
Christopher Tate
1f284855fc am f066bf22: am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev 
* commit 'f066bf229cd28210af476a7a02b6901e0bd9e829':
  Prevent some alarm pathologies
 2014-11-19 00:19:56 +00:00
Rubin Xu
3c1d5e2f9d am 40603baa: am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '40603baa3ec570b1cb423e3488125b1dd35cb5e9':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:19:50 +00:00
Rubin Xu
f978e667a6 am 0122db0a: am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 
* commit '0122db0a6397f5bd08042e1a5919114e3cccb9f4':
  Fix equality test in getProfileOwnerAdmin()
 2014-11-19 00:19:43 +00:00
Jeff Sharkey
c5efb2b92a am d6447bbc: Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 
* commit 'd6447bbc88b8c1c238dd8e5bfb4b0daf6d2266cb':
  Speed up GrantUri.hashCode().
 2014-11-19 00:14:51 +00:00
Marco Nelissen
d99e62c5a0 am 7f8040a8: am 0acbed25: am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev 
* commit '7f8040a80472b86c358f4b28ca7ec938d7fbed00':
  Use stream type if set by user
 2014-11-19 00:14:09 +00:00
Jinsuk Kim
86a1e5a16e CEC: Use thread-safe version for avr info 
getSystemAudioMode() should have used the thread-safe method
to get the information of the connected AVR.

Bug: 18426137

Change-Id: Ib3edff97337b5960160dd39d551fbfbbfdfce93b
 2014-11-19 09:12:21 +09:00
Jeff Sharkey
d6447bbc88 Merge "Speed up GrantUri.hashCode()." into lmp-mr1-dev 2014-11-19 00:09:51 +00:00
Christopher Tate
f066bf229c am 04eb368d: Merge "Prevent some alarm pathologies" into lmp-mr1-dev 
* commit '04eb368d0381b0f94365b4e270afb610fe3564c2':
  Prevent some alarm pathologies
 2014-11-19 00:09:50 +00:00
Rubin Xu
40603baa3e am 735f2285: Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" into lmp-mr1-dev 
* commit '735f22850edcb5c2447c37cb96f048de8a742907':
  Remove permission check in DevicePolicyManager.isUninstallBlocked()
 2014-11-19 00:09:43 +00:00
Rubin Xu
0122db0a63 am 3a7d3fc6: Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-dev 
* commit '3a7d3fc60e1347ff9bdddb8040237e2818d67a0e':
  Fix equality test in getProfileOwnerAdmin()
 2014-11-19 00:09:38 +00:00
Christopher Tate
04eb368d03 Merge "Prevent some alarm pathologies" into lmp-mr1-dev 2014-11-18 23:49:54 +00:00