190712 Commits

Author SHA1 Message Date
Amith Yamasani
3184b28648 am fa4eda44: Merge "Remove network access for idle apps" into mnc-dev
* commit 'fa4eda443e32bf050721148c1ec5c6602246835a':
  Remove network access for idle apps
2015-04-29 22:40:31 +00:00
Ben Kwa
0c04cf9aae am ac151b1e: am 94d07cb7: Merge "Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile." into mnc-dev
* commit 'ac151b1e9945599982c6cf871fd82817db7297fb':
  Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile.
2015-04-29 22:40:29 +00:00
Roozbeh Pournader
5f49c28bfc Rename FONT_NOTOSANS_FULL to FONT_NOTOSANS_JP_FULL.
This clarifies the meaning of the variable, that this switch only
affects the Noto Sans Japanese font.

Change-Id: I28043ed41ec51af0273a071692426d51352ef849
2015-04-29 15:38:07 -07:00
Adrian Roos
42395cdb9e am 666dbb43: am b00540dc: am e632dc35: Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev
* commit '666dbb43b97cd80f679e6c233fa987627d90ea72':
  Clarify javadoc of isKeyguardSecure and isDeviceSecure
2015-04-29 22:37:23 +00:00
Alan Viverette
f601440e21 Stash modulation alpha until ColorStateList has resolved base color
Fixes an issue where specifying an explicit modulation alpha and a
theme-dependent base color discarded the modulation alpha during
applyTheme().

Sets the YOU MESSED UP YOUR THEME color to magenta, which matches the
behavior for RippleDrawable and should expose any remaining issues in
a painfully obvious way.

Bug: 20690409
Change-Id: I7a44f4bc4a5a85be6d3f27087b2d6c9ea12e1d29
2015-04-29 15:36:11 -07:00
Amith Yamasani
fa4eda443e Merge "Remove network access for idle apps" into mnc-dev 2015-04-29 22:31:19 +00:00
Chris Craik
775e94cbf1 am e74ff81e: Merge "Remove concept of layer alpha override" into mnc-dev
* commit 'e74ff81e0575bbe4361960739131a0256167f7c8':
  Remove concept of layer alpha override
2015-04-29 22:25:59 +00:00
Ben Kwa
ac151b1e99 am 94d07cb7: Merge "Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile." into mnc-dev
* commit '94d07cb7efbdd50b72d7f17e7c9596b789ebad4c':
  Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile.
2015-04-29 22:25:55 +00:00
Adrian Roos
666dbb43b9 am b00540dc: am e632dc35: Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev
* commit 'b00540dc5c2d475fd6a6833f1a805cb0a683e264':
  Clarify javadoc of isKeyguardSecure and isDeviceSecure
2015-04-29 22:22:17 +00:00
Chris Craik
e74ff81e05 Merge "Remove concept of layer alpha override" into mnc-dev 2015-04-29 22:16:11 +00:00
Ben Kwa
94d07cb7ef Merge "Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile." into mnc-dev 2015-04-29 22:12:08 +00:00
Adrian Roos
b00540dc5c am e632dc35: Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev
* commit 'e632dc35d8dcad7a09f9abefd5f9fcf2103f3b69':
  Clarify javadoc of isKeyguardSecure and isDeviceSecure
2015-04-29 22:08:24 +00:00
Adrian Roos
e632dc35d8 Merge "Clarify javadoc of isKeyguardSecure and isDeviceSecure" into mnc-dev 2015-04-29 21:57:52 +00:00
Alan Viverette
cd2ea076bb am 746c6088: am 46d8644e: am edcaf7c9: Merge "Don\'t propagate level or RTL in LayerDrawable.setDrawable()" into mnc-dev
* commit '746c608881e4422af73ea73ba7236c06be5f6029':
  Don't propagate level or RTL in LayerDrawable.setDrawable()
2015-04-29 21:52:06 +00:00
Wale Ogunwale
3c624546cc am e41c6688: am 1ee30f6a: am 00758a3b: Merge "Some code clean-up." into mnc-dev
* commit 'e41c6688a0aa762ee560806233298bbaca8de27c':
  Some code clean-up.
2015-04-29 21:52:02 +00:00
Svet Ganov
208b2c3b9a am 2c372ef0: am 104a23c5: am e3538083: Merge "Add API to get app op for a permission" into mnc-dev
* commit '2c372ef0240c5f1444d118b046e66c9f35fec28a':
  Add API to get app op for a permission
2015-04-29 21:51:56 +00:00
destradaa
bfb3bdb918 Update use of A-GPS modes in GpsLocationProvider
b/20664846

This change reflects the documentation changes made in gps.h for the
upcoming Android release.

Change-Id: Id3e04492febdabd42e91a12e221d1192947b8061
2015-04-29 14:49:39 -07:00
Alan Viverette
746c608881 am 46d8644e: am edcaf7c9: Merge "Don\'t propagate level or RTL in LayerDrawable.setDrawable()" into mnc-dev
* commit '46d8644e42f79b70fd6efdeb1f93935f7d21fe93':
  Don't propagate level or RTL in LayerDrawable.setDrawable()
2015-04-29 21:39:55 +00:00
Wale Ogunwale
e41c6688a0 am 1ee30f6a: am 00758a3b: Merge "Some code clean-up." into mnc-dev
* commit '1ee30f6a7f61c0f4ae79f9f7f6e829c96f91870f':
  Some code clean-up.
2015-04-29 21:39:41 +00:00
Svet Ganov
2c372ef024 am 104a23c5: am e3538083: Merge "Add API to get app op for a permission" into mnc-dev
* commit '104a23c544f2841a752bf0c004483ead5edd34ff':
  Add API to get app op for a permission
2015-04-29 21:39:35 +00:00
Andrew Solovay
5fb97fe9ba docs: Minor formatting cleanup.
Code sample had an overlong line, which caused a horizontal scroll-
bar in the generated doc.

Change-Id: I55b0318049be9e4ff473bdc739bb8265ca2da248
2015-04-29 14:37:22 -07:00
Alan Viverette
46d8644e42 am edcaf7c9: Merge "Don\'t propagate level or RTL in LayerDrawable.setDrawable()" into mnc-dev
* commit 'edcaf7c9338d4b3b78766ccec9c1e2c4dcd75cf2':
  Don't propagate level or RTL in LayerDrawable.setDrawable()
2015-04-29 21:34:14 +00:00
Wale Ogunwale
1ee30f6a7f am 00758a3b: Merge "Some code clean-up." into mnc-dev
* commit '00758a3b370879ac1f21fc85c291f741f947eca3':
  Some code clean-up.
2015-04-29 21:34:10 +00:00
Alan Viverette
edcaf7c933 Merge "Don't propagate level or RTL in LayerDrawable.setDrawable()" into mnc-dev 2015-04-29 21:29:30 +00:00
Alan Viverette
1f29e71c46 Don't propagate level or RTL in LayerDrawable.setDrawable()
The developer used to be responsible for this and automatically
propagating the values breaks some use cases (ex. in Camera).

Bug: 20696311
Change-Id: Ia8ddc132c6d629bcc27d66f654baf30d9f078568
2015-04-29 14:28:25 -07:00
Svet Ganov
104a23c544 am e3538083: Merge "Add API to get app op for a permission" into mnc-dev
* commit 'e35380839e582a98477ba9181460ebfee1c74a9f':
  Add API to get app op for a permission
2015-04-29 21:27:22 +00:00
Mike Lockwood
4e17165287 am 62b4cbce: am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev
* commit '62b4cbceb33dc657cfaee2971ad6bc3d1aab3fbb':
  MidiDeviceInfo: Add version string property
2015-04-29 21:26:01 +00:00
Wale Ogunwale
00758a3b37 Merge "Some code clean-up." into mnc-dev 2015-04-29 21:24:46 +00:00
Amith Yamasani
15e47235c0 Remove network access for idle apps
Track apps going in and out of idle in the NetworkPolicyManagerService.
Apply DROP rules in firewall controller if app is to be blacklisted
for network access.

Firewall can now be in whitelist (old) or blacklist mode. When in
blacklist, it allows all by default and we can selectively DENY
some uids.

Track app idle in UsageStats and update periodically.
Track charging/discharging states.

TODO: Check for appidle temporary parole state

Bug: 20066058
Change-Id: Ia65d7544204b3bcb78a517310ef4adcc05aac6fb
2015-04-29 14:21:53 -07:00
Mike Lockwood
62b4cbceb3 am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev
* commit 'bcec6a4980366f10182c8dc09ec1eff6f78d7043':
  MidiDeviceInfo: Add version string property
2015-04-29 21:15:25 +00:00
Svet Ganov
e35380839e Merge "Add API to get app op for a permission" into mnc-dev 2015-04-29 21:15:25 +00:00
Andy Hung
26eca01c49 Check for null codec from AMediaCodec_createDecoderByType
NULL codec can now occur if codec cannot be created.

Bug: 20566134
Change-Id: I08d54e733a01d0614313673dc49a6f5e702633ac
2015-04-29 14:09:45 -07:00
Andy Hung
fe48e0dfb9 Pass PlaybackSettings as class object for AudioTrack JNI
Change-Id: Ic7fb5f84ed1fc4cc2286e5c207fee5298a64a5a4
2015-04-29 14:09:18 -07:00
Adrian Roos
c39b4fc686 Clarify javadoc of isKeyguardSecure and isDeviceSecure
Bug: 20642788
Change-Id: I1114150cd645ee3de8e4617cdb79ff351e01b9df
2015-04-29 14:02:55 -07:00
Mike Lockwood
bcec6a4980 am e1d00395: Merge "MidiDeviceInfo: Add version string property" into mnc-dev
* commit 'e1d003958de51c135ef92ae49ebdaa0f07d959dc':
  MidiDeviceInfo: Add version string property
2015-04-29 21:02:39 +00:00
Dianne Hackborn
c5cbdfcfe5 am 8756f9b3: am 599a4e0e: am 9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev
* commit '8756f9b34dd04cabae7487bd1941008a6c98c4c6':
  Implement user-settable power save whitelist.
2015-04-29 21:02:36 +00:00
Mike Lockwood
ec317987e0 am 94582c5f: am 973a70d7: am f105f61d: Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev
* commit '94582c5fb632b17b751729a929ff94ef8aa216a1':
  UsbDevice: Add support for retrieving version string for a USB device
2015-04-29 21:02:30 +00:00
Junda Liu
a7a6708510 am 01da3124: am df3a6f3e: am bd0ffb8e: Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev
* commit '01da31247b8b2999bcfefe1f55ca396ee177ad69':
  Moving all Telephony overlays to CarrierConfigManager.
2015-04-29 21:02:25 +00:00
Dianne Hackborn
8756f9b34d am 599a4e0e: am 9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev
* commit '599a4e0ea864769e6cd1d04bd766c472b16be4c7':
  Implement user-settable power save whitelist.
2015-04-29 20:51:04 +00:00
Mike Lockwood
94582c5fb6 am 973a70d7: am f105f61d: Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev
* commit '973a70d7c9dd2cda38500880bbc3873f238f1fe3':
  UsbDevice: Add support for retrieving version string for a USB device
2015-04-29 20:50:58 +00:00
Junda Liu
01da31247b am df3a6f3e: am bd0ffb8e: Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev
* commit 'df3a6f3e8d416956763ddaa74f65104d28dcbdfb':
  Moving all Telephony overlays to CarrierConfigManager.
2015-04-29 20:50:53 +00:00
Mike Lockwood
e1d003958d Merge "MidiDeviceInfo: Add version string property" into mnc-dev 2015-04-29 20:50:35 +00:00
Chris Craik
d5811f3d60 am 7a6208e2: am 4549108c: am 81bd735a: Merge "Require minimum 4 bit stencil for layers." into mnc-dev
* commit '7a6208e24ac27f0cc607f6cd99c67e74e356d437':
  Require minimum 4 bit stencil for layers.
2015-04-29 20:44:54 +00:00
John Reck
e3b60691ed am 6228ea26: am 108f0a34: am b2cec86a: Merge "Skip frames with no damage" into mnc-dev
* commit '6228ea26effa52e29f8a1b30fd4043767fd44fc7':
  Skip frames with no damage
2015-04-29 20:44:49 +00:00
Mike Lockwood
02868b1625 MidiDeviceInfo: Add version string property
For USB devices, this is populated with the USB device version string.

Change-Id: Ia9286d5f41783e4e960a9c724bf6b85b6599fe12
2015-04-29 13:44:34 -07:00
Dianne Hackborn
599a4e0ea8 am 9ac2718e: Merge "Implement user-settable power save whitelist." into mnc-dev
* commit '9ac2718e7dcf274ad41fbb374bedabadc558634b':
  Implement user-settable power save whitelist.
2015-04-29 20:40:12 +00:00
Mike Lockwood
973a70d7c9 am f105f61d: Merge "UsbDevice: Add support for retrieving version string for a USB device" into mnc-dev
* commit 'f105f61dd9ff790c6ace406e73c3bddac87a8925':
  UsbDevice: Add support for retrieving version string for a USB device
2015-04-29 20:40:07 +00:00
Junda Liu
df3a6f3e8d am bd0ffb8e: Merge "Moving all Telephony overlays to CarrierConfigManager." into mnc-dev
* commit 'bd0ffb8e34a91735e73fbc680539382dd5691191':
  Moving all Telephony overlays to CarrierConfigManager.
2015-04-29 20:40:01 +00:00
Chris Craik
7a6208e24a am 4549108c: am 81bd735a: Merge "Require minimum 4 bit stencil for layers." into mnc-dev
* commit '4549108c46ef1103996ae2f98123d033da54bce6':
  Require minimum 4 bit stencil for layers.
2015-04-29 20:33:53 +00:00
Dianne Hackborn
9ac2718e7d Merge "Implement user-settable power save whitelist." into mnc-dev 2015-04-29 20:33:51 +00:00