Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suprabh Shukla
ffddadb04a Fixing isOpRestricted in AppOpsService 
AppOpsService was returning false for a restricted operation if the
operation did not allow the system to bypass the restrictions on it.

Bug: 28860721
Change-Id: I487e23f1d3bf6ea602caee439fb500c058e7c8ff
 2016-05-20 16:37:33 -07:00
Android Build Merger (Role)
2d510f9d99 Merge "Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 am: 89770ebf62" into nyc-mr1-dev-plus-aosp 2016-05-20 23:09:03 +00:00
Android Build Merger (Role)
abb81c5972 Merge "Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 am: fe25025c5c" into nyc-mr1-dev-plus-aosp 2016-05-20 23:08:57 +00:00
Android Build Merger (Role)
c0d61dec97 Merge "Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev am: ecab20d852 am: e130c935a4" into nyc-mr1-dev-plus-aosp 2016-05-20 23:08:52 +00:00
Robert Carr
ac0ed76278 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 
am: fe25025c5c

* commit 'fe25025c5c9e551599a8ce5228cc5d4b41385f3b':
  Correctly clear resizing drawable when nulling background.

Change-Id: Ib93cee44edc0317a806d90ea2b2a44d293af1c1f
 2016-05-20 23:08:20 +00:00
Robert Carr
0ee80d4420 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev am: a3ec065a43 
am: 89770ebf62

* commit '89770ebf62d8a15dc899f89f29a541fbb839ee69':
  Correctly clear resizing drawable when nulling background.

Change-Id: Ie1347dd9d19c15b8e42611268b3c92e1ff1e4738
 2016-05-20 23:08:19 +00:00
Brad Ebinger
547420c846 Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev am: ecab20d852 
am: a1fa294de8

* commit 'a1fa294de82114fbf4b1b3ae4121727bc611ef75':
  Add check for Vibration RingerMode in VibratorService

Change-Id: I3b0a54c064f622444d4ab28d2efba988e5ff5a8c
 2016-05-20 23:08:15 +00:00
Brad Ebinger
fde019b1bc Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev am: ecab20d852 
am: e130c935a4

* commit 'e130c935a456a1b044f3757e01c623baddad0320':
  Add check for Vibration RingerMode in VibratorService

Change-Id: I21fa3e5328e3a2b5b595ff5d1367417fa3e881b0
 2016-05-20 23:08:14 +00:00
Robert Carr
89770ebf62 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev 
am: a3ec065a43

* commit 'a3ec065a43069a19dc42f023a40d54a3178f1b44':
  Correctly clear resizing drawable when nulling background.

Change-Id: I9cbb109bbd7891c30711a68bf88d8b2c4332baa3
 2016-05-20 23:01:03 +00:00
Robert Carr
fe25025c5c Merge "Correctly clear resizing drawable when nulling background." into nyc-dev 
am: a3ec065a43

* commit 'a3ec065a43069a19dc42f023a40d54a3178f1b44':
  Correctly clear resizing drawable when nulling background.

Change-Id: Ifb02cc95efc8b164ab8ee63fa9d83bae3172da23
 2016-05-20 23:01:02 +00:00
Brad Ebinger
a1fa294de8 Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev 
am: ecab20d852

* commit 'ecab20d852826286e4d9d8c095ef61cebbb0ab4e':
  Add check for Vibration RingerMode in VibratorService

Change-Id: If1c4c9969b16cd751f802e62ec6960762e4fbafa
 2016-05-20 23:00:59 +00:00
Brad Ebinger
e130c935a4 Merge "Add check for Vibration RingerMode in VibratorService" into nyc-dev 
am: ecab20d852

* commit 'ecab20d852826286e4d9d8c095ef61cebbb0ab4e':
  Add check for Vibration RingerMode in VibratorService

Change-Id: Iaab0a9006897ba57e25be58723c96f2bc214df71
 2016-05-20 23:00:58 +00:00
TreeHugger Robot
a3ec065a43 Merge "Correctly clear resizing drawable when nulling background." into nyc-dev 2016-05-20 22:56:47 +00:00
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)
e5de90d136 Merge "Merge "Merge "Fix cut off actions in messaging style" into nyc-dev am: cbfef08990" into nyc-mr1-dev am: eb70ae584c" into nyc-mr1-dev-plus-aosp 2016-05-20 22:24:19 +00:00
Android Build Merger (Role)
f71eae2644 Merge "Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev am: ac517216c5" into nyc-mr1-dev-plus-aosp 2016-05-20 22:24:06 +00:00
Adrian Roos
7bff407318 Merge "Merge "Fix cut off actions in messaging style" into nyc-dev am: cbfef08990" into nyc-mr1-dev 
am: eb70ae584c

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

Change-Id: Ic2208930558eac09bd5c823caa4150302b8c708b
 2016-05-20 22:23:18 +00:00
Meng Wang
fe9ed66227 Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev 
am: ac517216c5

* commit 'ac517216c50075baf3f93ae06ebec3dcb68ad9a9':
  Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager

Change-Id: Ice91655cf111964ec20f961b2555da3cc4b9325c
 2016-05-20 22:21:26 +00:00
Adrian Roos
b7894e1804 Merge "Fix cut off actions in messaging style" into nyc-dev am: cbfef08990 
am: d5d76f6d5c

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

Change-Id: I7f84c9e30185942c4fb200880718a3b3d272fdd3
 2016-05-20 22:21:17 +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
d5d76f6d5c Merge "Fix cut off actions in messaging style" into nyc-dev 
am: cbfef08990

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

Change-Id: I732a67af98e2ee083ef004e3266e6662b85308ad
 2016-05-20 22:17:10 +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
Android Build Merger (Role)
15271acf70 Merge "Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev am: 44fbbfd248 am: f2f9867437" into nyc-mr1-dev-plus-aosp 2016-05-20 21:07:49 +00:00
Jae Seo
c9da4f8b1c Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev am: 44fbbfd248 
am: f2f9867437

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

Change-Id: I462e30c2ddc354203c635051254b11eedb545ed9
 2016-05-20 21:07:26 +00:00
Jae Seo
91b7a92ca0 Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev am: 44fbbfd248 
am: 79108f18bf

* commit '79108f18bf73f0a1689dff903dac923045a9de59':
  MediaBrowserService: Add more explanation on getBrowserRootHints()

Change-Id: Ic01bd347bb78c5d3119d4f5e8ecf02c736b7018c
 2016-05-20 21:07:23 +00: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
79108f18bf Merge "MediaBrowserService: Add more explanation on getBrowserRootHints()" into nyc-dev 
am: 44fbbfd248

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

Change-Id: I0cc37df958a3419770cc943a077f35bd3c41a324
 2016-05-20 21:02:11 +00: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
Android Build Merger (Role)
f778cf773c Merge "Merge "QS: Fix RTL animation" into nyc-dev am: d1df86dbb8 am: 5a2b96a8c5" into nyc-mr1-dev-plus-aosp 2016-05-20 20:01:32 +00:00
Android Build Merger (Role)
7a470f88f3 Merge "Merge "QS: Fix RTL animation" into nyc-dev am: d1df86dbb8 am: 395e0f6cff" into nyc-mr1-dev-plus-aosp 2016-05-20 20:01:29 +00:00
Android Build Merger (Role)
9835c0c1f3 Merge "Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2 am: 5ac2c3b4a0" into nyc-mr1-dev-plus-aosp 2016-05-20 20:01:21 +00:00
Jason Monk
ba7b1de84b Merge "QS: Fix RTL animation" into nyc-dev am: d1df86dbb8 
am: 5a2b96a8c5

* commit '5a2b96a8c5d0f6a96964016ebad823766f18cc45':
  QS: Fix RTL animation

Change-Id: I6b71bd01e6ac97ed244e0b2ac2ed59e4e7215c71
 2016-05-20 20:00:51 +00:00
Roozbeh Pournader
a3496000ad Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2 
am: 5ac2c3b4a0

* commit '5ac2c3b4a0e646884b6998fbccf538145cf70e7a':
  Clear locales without changing layout direction.

Change-Id: I06ee22dda58c9e6f83a0e829992ff8d3ddf96928
 2016-05-20 20:00:43 +00:00
Jason Monk
fad6a9fcd5 Merge "QS: Fix RTL animation" into nyc-dev am: d1df86dbb8 
am: 395e0f6cff

* commit '395e0f6cffa54c9dea1d42696e59c2ae50e30297':
  QS: Fix RTL animation

Change-Id: Ia81571da61db1533e8af77b80c8642383172c1e1
 2016-05-20 20:00:42 +00:00
Roozbeh Pournader
461e71472d Merge "Clear locales without changing layout direction." into nyc-dev am: 6686711ba2 
am: 18bf0e2ad2

* commit '18bf0e2ad22a28060e9cbd1516b1c36236c5b557':
  Clear locales without changing layout direction.

Change-Id: Ia3925ac1adbf3e5cdaa45c1d88f9fc50483765cb
 2016-05-20 20:00:39 +00:00
Tony Mak
9ece303402 Remove PROPERTY_WORK_CALL 
Bug: 28842878
Change-Id: I7fb28ec3b121f4546ea60d6b170c2c6d98ffcb8c
 2016-05-20 19:56:08 +00:00
Jason Monk
395e0f6cff Merge "QS: Fix RTL animation" into nyc-dev 
am: d1df86dbb8

* commit 'd1df86dbb8a86c607d7fc1e0a89c7a10fe9899fa':
  QS: Fix RTL animation

Change-Id: Id61eb8c61845ab5a7edbcd20444cc0df4a5074c8
 2016-05-20 19:52:59 +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
18bf0e2ad2 Merge "Clear locales without changing layout direction." into nyc-dev 
am: 6686711ba2

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

Change-Id: Ifa6124e9b772b54355b696aa4df1ca94950c64c5
 2016-05-20 19:52:55 +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
28983b4cf2 Merge "Fix notifications for USB PD enabled devices" into nyc-dev am: 73722c4b0c 
am: 59c27e95a1

* commit '59c27e95a1d7db4431e476d42c5f8e1e6090e0f7':

Change-Id: I94356193ceb727d145ffdbe45b619e0159722355
 2016-05-20 18:52:15 +00:00