Commit Graph

246497 Commits

Author SHA1 Message Date
Brad Ebinger
ecab20d852 Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev 2016-05-20 22:53:27 +00:00
Android Build Merger (Role)
eb70ae584c Merge "Merge "Fix cut off actions in messaging style" into nyc-dev am: cbfef08990" into nyc-mr1-dev 2016-05-20 22:17:31 +00:00
Meng Wang
ac517216c5 Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev 2016-05-20 22:17:11 +00:00
Adrian Roos
ed1f7f41c0 Merge "Fix cut off actions in messaging style" into nyc-dev
am: cbfef08990

* commit 'cbfef08990e4d44c723da71f7f7271a72fb10f17':
  Fix cut off actions in messaging style

Change-Id: Ie4ba804300222128034d157199a7be3b14facf3e
2016-05-20 22:17:08 +00:00
Adrian Roos
cbfef08990 Merge "Fix cut off actions in messaging style" into nyc-dev 2016-05-20 22:08:37 +00:00
Adam Lesinski
76da37e1cf Performance improvements in AssetManager
Change the implementation of getLocales() to iterate the set of
configurations using a templated method, instead of using the result
of getConfigurations().

Also remove the check for AndroidManifest.xml when adding an asset path.
This is unneccessary.

Bug:28625993
Change-Id: I16de5da598d0c371421d1dc8eee054dce9baf53a
2016-05-20 15:04:09 -07:00
Jae Seo
f2f9867437 Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev
am: 44fbbfd248

* commit '44fbbfd24857ad0defcaa0ef85c0d5b01cd2250a':
  MediaBrowserService: Add more explanation on getBrowserRootHints()

Change-Id: Id16ebed81d2865553e3ded626cf9b27dffba8dce
2016-05-20 21:03:00 +00:00
Adrian Roos
18d099a8fb Keep notifications with active remote inputs
Fixes a bad interaction when the app cancels the notification
into which the user is typing. This happens for example when
the user initiates direct reply from the lock screen and the
app is currently open underneath the lockscreen.

Also cleans up the code that clears notification effects by
moving it into the appropriate place (without functional changes).

Fixes: 28745456
Change-Id: I69e076642e93930d41cfb06f2a48836aea34d92d
2016-05-20 14:02:20 -07:00
Jae Seo
44fbbfd248 Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev 2016-05-20 20:53:03 +00:00
Brad Ebinger
2d1c3b3a6c Add check for Vibration RingerMode in VibratorService
Add a check for whether or not the Phone is in the Vibrate RingerMode
when deciding whether or not to vibrate for an incoming call.

Bug: 28569078
Change-Id: Ib2e6243fd0b18c5426b5572c0806d67111a80a57
2016-05-20 20:31:53 +00:00
Meng Wang
64997623bf Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager
Also:
   Add RIL constants RIL_REQUEST_SET_ALLOWED_CARRIERS, RIL_REQUEST_GET_ALLOWED_CARRIERS

Bug: 28564314
Change-Id: Iaf6c40de633e767309c4088249a5c13cb0988c5c
2016-05-20 13:18:41 -07:00
Tony Mak
9ece303402 Remove PROPERTY_WORK_CALL
Bug: 28842878
Change-Id: I7fb28ec3b121f4546ea60d6b170c2c6d98ffcb8c
2016-05-20 19:56:08 +00:00
Jason Monk
5a2b96a8c5 Merge "QS: Fix RTL animation" into nyc-dev
am: d1df86dbb8

* commit 'd1df86dbb8a86c607d7fc1e0a89c7a10fe9899fa':
  QS: Fix RTL animation

Change-Id: I4e7592dc1363984d40050e75aea4b605d0fb6b39
2016-05-20 19:52:57 +00:00
Seigo Nonaka
5ac2c3b4a0 Merge "Clear locales without changing layout direction." into nyc-dev
am: 6686711ba2

* commit '6686711ba289740a20dc15133aed4a2b5bac5d44':
  Clear locales without changing layout direction.

Change-Id: I5c7714d3ef54fc7caf6580837d48a1b79e56a892
2016-05-20 19:52:54 +00:00
Jason Monk
d1df86dbb8 Merge "QS: Fix RTL animation" into nyc-dev 2016-05-20 19:42:40 +00:00
Roozbeh Pournader
6686711ba2 Merge "Clear locales without changing layout direction." into nyc-dev 2016-05-20 19:42:31 +00:00
Chris Wren
cf548bfad6 Don't throw RemoteException from new NLS APIs
Bug: 28820058
Change-Id: If4a290ab7549aa999cee348bf0db85b70cb57553
2016-05-20 14:53:16 -04:00
Vincent Palatin
9c3086ceff Merge "Fix notifications for USB PD enabled devices" into nyc-dev
am: 73722c4b0c

* commit '73722c4b0cdd3aea12f67b3822244dc3b4aa4387':
  Fix notifications for USB PD enabled devices

Change-Id: I9944f705b6a2de59216c2f81613a53546c5f1b50
2016-05-20 18:44:41 +00:00
Jason Monk
61d118d650 QS: Fix RTL animation
Change-Id: I9de6e0891fa98ec2212abe28fa942779aa224056
Fixes: 28674500
2016-05-20 14:44:16 -04:00
TreeHugger Robot
73722c4b0c Merge "Fix notifications for USB PD enabled devices" into nyc-dev 2016-05-20 18:32:10 +00:00
Chris Wren
66619a2ea1 Never fetch notification badges for USER_SYSTEM
This user never gets a badge, and secondary users will
see a security exception attempting to fetch it for
USER_ALL notifications, such as USB and battery state,
which are posted by USER_SYSTEM.

Bug: 28743335
Change-Id: I65aeb1cf2192811055f8cd94df0b7e292c5c1acf
2016-05-20 14:24:55 -04:00
Seigo Nonaka
bd5cac67b8 Clear locales without changing layout direction.
Calling Configuration.setLocales with emtpy LocaleList may change the
layout direction to LTR. To clear the locales in Configuration without
layout direction change, introduce hidden API to Configuration.

Bug: 28695661
Change-Id: I47c339dffb83099bd329ddb60237dab27b05f593
2016-05-20 17:59:35 +00:00
Siyamed Sinir
214ebfb532 Merge "setTransformationMethod should reset mTextDir" into nyc-dev
am: df9dee869c

* commit 'df9dee869c9efa18619b28691c88415b4f115df7':
  setTransformationMethod should reset mTextDir

Change-Id: I17d4dc951f840dcfc1e76ed6e9d6b02150495bf9
2016-05-20 17:53:44 +00:00
Siyamed Sinir
df9dee869c Merge "setTransformationMethod should reset mTextDir" into nyc-dev 2016-05-20 17:46:27 +00:00
Paul Stewart
7ca542fa99 Merge "Don\'t remove existing EAP configurations" into nyc-dev
am: c7ad1ac712

* commit 'c7ad1ac712f09c5bc116c66a54a860000b53fa38':
  Don't remove existing EAP configurations

Change-Id: I743d4b0291b7d0c864d30cb04acd7811428419d0
2016-05-20 17:45:20 +00:00
Paul Stewart
c7ad1ac712 Merge "Don't remove existing EAP configurations" into nyc-dev 2016-05-20 17:39:44 +00:00
Jeff Sharkey
d21cad13a6 API council feedback: hide and document.
Hide isMetered() and clarify moveDatabaseFrom() docs.

Bug: 28870582, 28775585
Change-Id: Iabe63045c39ce7f662488f4224b56387c3c59519
2016-05-20 11:34:55 -06:00
Adam Lesinski
7dd96663a0 Merge "Fix parsing of kernel wakelocks" into nyc-dev
am: 6f0d399214

* commit '6f0d3992149aa782450667ed750fe0c3cf8ee334':
  Fix parsing of kernel wakelocks

Change-Id: I8627d87ce84e9c03407a8e5be353aa44635a7712
2016-05-20 17:27:23 +00:00
Wale Ogunwale
117c975fe2 Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev
am: a781232656

* commit 'a78123265658380b3968773a5f575b0ba1b4620e':
  Put launch adjacent activity in a new task if the activity does exist

Change-Id: I128ecd96abb81d2ae6a055bace315a8e69a17ac9
2016-05-20 17:24:06 +00:00
Adam Lesinski
6f0d399214 Merge "Fix parsing of kernel wakelocks" into nyc-dev 2016-05-20 17:23:08 +00:00
TreeHugger Robot
a781232656 Merge "Put launch adjacent activity in a new task if the activity does exist" into nyc-dev 2016-05-20 17:15:59 +00:00
Christopher Tate
d33151bf4f Merge "Back up / restore the \'mono audio\' setting" into nyc-dev
am: a3aaa5ee25

* commit 'a3aaa5ee2558ac5a6b6ca0b309dc9eea4c51bf14':
  Back up / restore the 'mono audio' setting

Change-Id: Ieb242d2d382218b6090acf0e72c33c865fb0994b
2016-05-20 17:11:10 +00:00
Chris Tate
a3aaa5ee25 Merge "Back up / restore the 'mono audio' setting" into nyc-dev 2016-05-20 17:05:39 +00:00
Jason Monk
80b7ccb67a Merge "Nav bar: fix tablet density change issues" into nyc-dev
am: 6c2bc3db95

* commit '6c2bc3db95dde4e4dff9d04266c3b87c8a6af306':
  Nav bar: fix tablet density change issues

Change-Id: I8119bffab2e66535b3eec7f0ce2c5ef990bebfea
2016-05-20 17:00:33 +00:00
Winson
e1a14b98a8 Only broadcast screenshot error to the current user.
am: 538c22630b

* commit '538c22630b3ffd3c9efd544552d5a7fb3ae876a8':
  Only broadcast screenshot error to the current user.

Change-Id: I6eb8e2212bb837d25644d0e79abaef9c8a61f9a5
2016-05-20 16:53:01 +00:00
TreeHugger Robot
6c2bc3db95 Merge "Nav bar: fix tablet density change issues" into nyc-dev 2016-05-20 16:52:20 +00:00
Winson
538c22630b Only broadcast screenshot error to the current user.
Bug: 28807226
Change-Id: I428ecc5572d7522580cdf38bded2fff9cf07abc2
2016-05-20 16:47:16 +00:00
Sanket Padawe
096e99e25c Merge "Add new TelephonyManager api to query Telephony metrics." into nyc-mr1-dev 2016-05-20 16:47:05 +00:00
Chris Wren
4ca84fa6b5 Merge "rate limit notification enqueues" into nyc-dev
am: 585ff8bd12

* commit '585ff8bd126ffac98164a87d24a9add5c23f9597':
  rate limit notification enqueues

Change-Id: I48a05345b210a68e507e648402a2ff19da44b7fc
2016-05-20 16:11:34 +00:00
TreeHugger Robot
585ff8bd12 Merge "rate limit notification enqueues" into nyc-dev 2016-05-20 16:04:50 +00:00
Tony Mak
2a63190228 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review
am: 53b5df43b4

* commit '53b5df43b49b191e442c4d2c7b9a9cba3ebdcf92':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I24a866a5947a20127f3b79e2e75ba0cf534b450c
2016-05-20 16:01:00 +00:00
Wale Ogunwale
13dbfff19e Put launch adjacent activity in a new task if the activity does exist
For the launch adjacent case we only want to put the activity in
an existing task if the activity already exists in the history.

Bug: 28828326
Change-Id: I1a6fdd6779cb20f8c0d9b7d94635b21718f4ac1b
2016-05-20 08:50:15 -07:00
Tony Mak
53b5df43b4 Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review
TODO: After updating all places that use the SDK, remove/hide the old API

Bug: 28842878

Change-Id: I131be644439080dd0507cd10d8bd6618246ee7ad
2016-05-20 15:39:38 +00:00
Paul Stewart
45e6fec2cf Don't remove existing EAP configurations
When merging backed-up configurations with the current supplicant
configuration, we read both configurations into a instance of
WifiNetworkSettings.  No EAP configurations should be restored as
per b/25725016, however existing EAP configurations that already
reside in wpa_supplicant.conf (presumably configured in SUW)
should not be removed in the process.

This CL adds a parameter to the "readNetworks" method to allow it
to select whether or not EAP configurations should be read in.  It
is used to allow the "restoreWifiSupplicant" method to copy in EAP
configurations from the existing wpa_supplicant.conf, but not out
of the backup data.

BUG: 28873992
Change-Id: I8b3e0c1a6629b3f1ca5055b1b2190e6b3ca4c033
2016-05-20 08:22:53 -07:00
Jason Monk
9a6552d71f Nav bar: fix tablet density change issues
- Re-inflate the contents of the NavigationBarInflaterView
 - Call up to parent to notify the contents has been reinflated
 - Fix how default tunable is handled, so that the resource is
   reloaded on density change

Change-Id: If25f68d01eedd3319b0c270e1cf80ac382eea637
Fixes: 27227522
2016-05-20 11:21:59 -04:00
Chris Wren
c8673a88fe rate limit notification enqueues
This is distinct from and in addition to the limit on the number of
distinct notifications. This includes many updates to a single
notification.

Bug: 28693065
Change-Id: I5ec0911716cace91d3ad85435a5c6123b290b3a2
2016-05-20 10:40:26 -04:00
Robin Lee
628ae0d841 Move VPN restriction check into setup dialog
The purpose of DISALLOW_CONFIG_VPN is to stop users from configuring
VPN, not from using it at all.

The key difference being that if the admin already enforced a VPN then
that setting should be respected (but it still shouldn't be tamperable).

Bug: 28733079
Change-Id: Ib8cab5657a9d5819a019093da3812cd8c2ca4050
2016-05-20 14:53:48 +01:00
Jason Monk
762bb8e3a5 Merge "QS Edit: Better handling if drags" into nyc-dev
am: b8fe7e8bff

* commit 'b8fe7e8bffea93ceb30a0d827f2ac573472507dd':
  QS Edit: Better handling if drags

Change-Id: Id24e45b73846ef9d52feea537382f01eb2872ad4
2016-05-20 13:47:57 +00:00
Jason Monk
b8fe7e8bff Merge "QS Edit: Better handling if drags" into nyc-dev 2016-05-20 13:42:57 +00:00
Neil Fuller
7efd7d6ef2 Merge "Add support for ICU data pinning in the Zygote" into nyc-dev
am: 761f70d5a6

* commit '761f70d5a6b926780db3bba95ee1e01b4d8d95be':
  Add support for ICU data pinning in the Zygote

Change-Id: If693e8cbb737186fdf0a3169d024bef08c8ceb6a
2016-05-20 13:00:29 +00:00