OSDN Git Service
Makoto Onuki [Mon, 18 Jul 2016 17:50:17 +0000 (17:50 +0000)]
Merge "Remove the DMAgent whitelisting" into nyc-mr1-dev
Abodunrinwa Toki [Mon, 18 Jul 2016 17:49:25 +0000 (17:49 +0000)]
Merge "DO NOT MERGE: FloatingToolbar - Check that app supports RTL." into nyc-mr1-dev
Hall Liu [Mon, 18 Jul 2016 17:44:38 +0000 (17:44 +0000)]
Merge "Add PROPERTY_IS_DOWNGRADED_CONFERENCE" into nyc-mr1-dev
Android Build Merger (Role) [Mon, 18 Jul 2016 17:29:41 +0000 (17:29 +0000)]
Merge "Merge \"docs: Added support library 24.1.0\" into nyc-dev am:
872ecfb0bf" into nyc-mr1-dev
Chris Tate [Mon, 18 Jul 2016 17:29:37 +0000 (17:29 +0000)]
Merge "Document that WallpaperManager.getDrawable() can return null" into nyc-mr1-dev
Andrew Solovay [Mon, 18 Jul 2016 17:29:02 +0000 (17:29 +0000)]
Merge \"docs: Added support library 24.1.0\" into nyc-dev
am:
872ecfb0bf
Change-Id: I6ba46b8efcc8567d6192ac274e08ed1489cb0c2e
Andrew Solovay [Mon, 18 Jul 2016 17:16:59 +0000 (17:16 +0000)]
Merge "docs: Added support library 24.1.0" into nyc-dev
Dirk Dougherty [Mon, 18 Jul 2016 15:21:11 +0000 (15:21 +0000)]
Doc change: updated issues in DP5 release notes.
am:
73b700404c
Change-Id: Id7bb33217a91f0e37497c83c6e4efbce8743df8b
Dirk Dougherty [Mon, 18 Jul 2016 15:09:24 +0000 (08:09 -0700)]
Doc change: updated issues in DP5 release notes.
Change-Id: I8c5af9a9523be71451a23bbac9b34da5079dbc27
smain@google.com [Mon, 18 Jul 2016 15:07:55 +0000 (15:07 +0000)]
Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev
am:
6623f4177c
Change-Id: I60626863804f787bf5e1435003d730427f1254df
Android Build Merger (Role) [Mon, 18 Jul 2016 15:03:02 +0000 (15:03 +0000)]
Merge "Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev am:
e92ebf666e" into nyc-mr1-dev
Dirk Dougherty [Mon, 18 Jul 2016 15:02:29 +0000 (15:02 +0000)]
Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev
am:
e92ebf666e
Change-Id: I7df3eb17a67a1ddc2019644d1efadacb149dcf48
TreeHugger Robot [Mon, 18 Jul 2016 15:00:20 +0000 (15:00 +0000)]
Merge "Add an isListen method to NetworkRequests." into nyc-mr1-dev
Scott Main [Mon, 18 Jul 2016 14:57:37 +0000 (14:57 +0000)]
Merge "update the version number used in docs and update the offline docs landing page" into nyc-dev
TreeHugger Robot [Mon, 18 Jul 2016 14:53:55 +0000 (14:53 +0000)]
Merge "Use "real" display size for computing available densities" into nyc-mr1-dev
Dirk Dougherty [Mon, 18 Jul 2016 14:52:44 +0000 (14:52 +0000)]
Merge "Doc change: updates for DP5 release notes." into nyc-dev
Ricky Wai [Mon, 18 Jul 2016 14:22:26 +0000 (14:22 +0000)]
Merge "Do not allow to disable package "android"" into nyc-mr1-dev
Ricky Wai [Fri, 15 Jul 2016 14:44:07 +0000 (15:44 +0100)]
Do not allow to disable package "android"
Bug:
25337001
Change-Id: I837d70898f00d3c97c8ae1f5eadd0791ba045df6
Julia Reynolds [Mon, 18 Jul 2016 13:25:54 +0000 (13:25 +0000)]
Merge \"Check uid for notification policy access.\" into nyc-dev
am:
8f17d2a48b
Change-Id: Iade2316b64a8d6dc43636fb292c08dbf82c9dc59
Julia Reynolds [Mon, 18 Jul 2016 13:16:15 +0000 (13:16 +0000)]
Merge "Check uid for notification policy access." into nyc-dev
Lorenzo Colitti [Mon, 18 Jul 2016 09:17:08 +0000 (18:17 +0900)]
Add an isListen method to NetworkRequests.
This allows simplification of the ConnectivityService code.
Bug:
23113288
Change-Id: I124544b99c5a920124e9a3d31cda8c6d2abc21fd
Dirk Dougherty [Mon, 18 Jul 2016 03:59:36 +0000 (20:59 -0700)]
Doc change: updates for DP5 release notes.
Change-Id: I39cca9088d6fc5952a359f42e43a324aad4427f0
Abodunrinwa Toki [Sun, 17 Jul 2016 18:25:27 +0000 (19:25 +0100)]
DO NOT MERGE: FloatingToolbar - Check that app supports RTL.
Port I36c0d72984e0abc7c6430cc7d52d8efd7341820e to nyc-mr1-dev.
Bug:
29932935
Change-Id: Icd085508f7d1dd412f4d0805e8fd01734743648e
Abodunrinwa Toki [Sun, 17 Jul 2016 18:07:08 +0000 (18:07 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev
Tim Murray [Sat, 16 Jul 2016 19:14:29 +0000 (19:14 +0000)]
Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev
Tim Murray [Sat, 16 Jul 2016 18:28:40 +0000 (11:28 -0700)]
Make sure StrictMode allows disk reads when calling isThreadInProcess.
If an application thread disables disk reads on the main thread,
isThreadInProcess will trigger a strict mode violation. This is bad if
the RenderThread is created after disk reads have been disallowed.
bug
30170339
Change-Id: I6918605d11f0c586c156f3168051376c3209b3f1
TreeHugger Robot [Sat, 16 Jul 2016 02:33:54 +0000 (02:33 +0000)]
Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev
Andreas Gampe [Sat, 16 Jul 2016 01:12:02 +0000 (18:12 -0700)]
Frameworks/base: Fix braino missing line
This got accidentally deleted in cleanup.
Bug:
29223204
Change-Id: I018b44d517f226eca30f141a3397c82a4be19afb
Adam Lesinski [Sat, 16 Jul 2016 00:49:49 +0000 (17:49 -0700)]
Deprecate Resources constructor and updateConfiguration() method
These methods were never meant to be public. Instead, developers
can use Context#createConfigurationContext().
Bug:
30088019
Bug:
29999297
Change-Id: I2b864136163deda0af99fa3bfe9ef4ee1077341a
Andrew Solovay [Sat, 16 Jul 2016 00:35:31 +0000 (00:35 +0000)]
Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev
am:
9d3bc86207
Change-Id: I21af2f098ffd3034b3f88548bfa9210996f7b397
TreeHugger Robot [Sat, 16 Jul 2016 00:24:48 +0000 (00:24 +0000)]
Merge "docs: Updating N Preview "behavior changes" doc for DP5" into nyc-dev
Andrew Solovay [Sat, 16 Jul 2016 00:22:59 +0000 (00:22 +0000)]
Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev
am:
833722e049
Change-Id: I8b594c2f28db69dd6e645dc2d79405f6da764806
TreeHugger Robot [Sat, 16 Jul 2016 00:13:16 +0000 (00:13 +0000)]
Merge "docs: Updating N Preview "API Overview" doc for DP5" into nyc-dev
TreeHugger Robot [Sat, 16 Jul 2016 00:03:51 +0000 (00:03 +0000)]
Merge "Block camera gesture during secondary user SUW" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 23:59:44 +0000 (23:59 +0000)]
Merge "Include an app icon." into nyc-mr1-dev
Doris Liu [Fri, 15 Jul 2016 23:46:07 +0000 (23:46 +0000)]
Merge "Ensure native allocation/free is correctly registered" into nyc-mr1-dev
Makoto Onuki [Fri, 15 Jul 2016 23:41:10 +0000 (23:41 +0000)]
Merge "Don't accept resource references in string fields" into nyc-mr1-dev
Makoto Onuki [Fri, 15 Jul 2016 23:31:15 +0000 (16:31 -0700)]
Remove the DMAgent whitelisting
Bug
30075554
Change-Id: Ib089353ff9f58eb175a7b5d9addfb371655afc6b
TreeHugger Robot [Fri, 15 Jul 2016 23:05:14 +0000 (23:05 +0000)]
Merge "Build both filename views before deleting." into nyc-mr1-dev
Andrew Solovay [Fri, 15 Jul 2016 02:08:11 +0000 (19:08 -0700)]
docs: Updating N Preview "behavior changes" doc for DP5
See first comment for doc stage location.
Change-Id: I11720bdabca78fdbaca82c7e3467f47b51e60f15
Christopher Tate [Fri, 15 Jul 2016 22:59:23 +0000 (15:59 -0700)]
Document that WallpaperManager.getDrawable() can return null
Bug
30164766
Change-Id: Idc03a41ea3fab3772de4f24551765dff78eb6d7f
Andrew Solovay [Fri, 15 Jul 2016 22:55:37 +0000 (22:55 +0000)]
Merge \"docs: Updating N Preview release notes for DP5\" into nyc-dev
am:
b91693fedd
Change-Id: I9e9a0982a141d09da5e7d68fb01df48adcb619a3
Andrew Solovay [Fri, 15 Jul 2016 22:46:49 +0000 (22:46 +0000)]
Merge "docs: Updating N Preview release notes for DP5" into nyc-dev
Andrew Solovay [Fri, 15 Jul 2016 22:45:57 +0000 (22:45 +0000)]
Merge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev
am:
085b4e8f7b
Change-Id: Id0ad00358c59e0a4187bd1f67bfc329e328c17bd
TreeHugger Robot [Fri, 15 Jul 2016 22:42:27 +0000 (22:42 +0000)]
Merge "docs: Describe how to update N Preview test devices on N release" into nyc-dev
Andrew Solovay [Fri, 15 Jul 2016 20:04:04 +0000 (13:04 -0700)]
docs: Updating N Preview "API Overview" doc for DP5
Added new "WebView" section, and minor tweak to the "Always On VPN"
section.
See first comment for doc stage location.
Change-Id: I1f57c2a73d1c8adaf4de0bf928711ba75f732436
Steve McKay [Fri, 15 Jul 2016 21:46:56 +0000 (14:46 -0700)]
Include an app icon.
Bug:
29880363
Change-Id: Ia8d9414ce536fb35acec1357d0f69d3ee158d853
Amith Yamasani [Fri, 15 Jul 2016 22:33:03 +0000 (15:33 -0700)]
Block camera gesture during secondary user SUW
Check for the current user's setup_complete state
before acting on the double-tap on power camera
launcher.
Bug:
30155500
Change-Id: I2ee8601411d270e288410e9d22ae07b97fa0de70
Makoto Onuki [Fri, 15 Jul 2016 22:22:33 +0000 (22:22 +0000)]
Merge "Cache the default launcher." into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 22:20:37 +0000 (22:20 +0000)]
Merge "Frameworks/base: Add compiler stats to Package Manager" into nyc-mr1-dev
Ashutosh Joshi [Fri, 15 Jul 2016 22:12:41 +0000 (22:12 +0000)]
Merge "Loading NanoApps now works." into nyc-mr1-dev
Cheryl Potter [Fri, 15 Jul 2016 22:07:16 +0000 (22:07 +0000)]
Merge \"docs: Add redirect for new AS Help menu item b/
30165151\" into nyc-dev
am:
462e5aae83
Change-Id: Iaf769efa2d7e30d82d02f1e8fd1ee96da640bf57
Cheryl Potter [Fri, 15 Jul 2016 21:55:04 +0000 (21:55 +0000)]
Merge "docs: Add redirect for new AS Help menu item b/
30165151" into nyc-dev
TreeHugger Robot [Fri, 15 Jul 2016 21:43:01 +0000 (21:43 +0000)]
Merge "Fix the allowed icon type error message" into nyc-mr1-dev
Jeff Sharkey [Fri, 15 Jul 2016 21:34:41 +0000 (15:34 -0600)]
Build both filename views before deleting.
Otherwise we'll throw when trying to create the second (visible)
filename because we just deleted it.
Bug:
30087518
Change-Id: I940a8f81c264fc17d477fadf46fd48eae29f2f6f
Andrew Solovay [Wed, 13 Jul 2016 19:13:08 +0000 (12:13 -0700)]
docs: Describe how to update N Preview test devices on N release
Noted that devices that are signed up for OTA updates will
automatically update to release version; devices that you flash
manually (and don't subsequently sign up for the beta program) will
need to be flashed with the production version.
See first comment for doc stage location.
Change-Id: I6755c837f80a459776880422f6d84af1d0b75f34
TreeHugger Robot [Fri, 15 Jul 2016 21:28:33 +0000 (21:28 +0000)]
Merge "Back up Night Light settings" into nyc-mr1-dev
Andrew Solovay [Fri, 15 Jul 2016 21:16:06 +0000 (21:16 +0000)]
Merge \"docs: Updating image download pages for DP5\" into nyc-dev
am:
84d59bc35d
Change-Id: I9c9f5afb071adccacc27b2479330ddbd121a631f
Adrian Roos [Fri, 15 Jul 2016 21:09:50 +0000 (21:09 +0000)]
Merge "Doze: Add config for fine grained proximity checks" into nyc-mr1-dev
Adrian Roos [Fri, 15 Jul 2016 21:09:36 +0000 (21:09 +0000)]
Merge "Notification: Apply small icon level" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 21:08:45 +0000 (21:08 +0000)]
Merge "docs: Updating image download pages for DP5" into nyc-dev
TreeHugger Robot [Fri, 15 Jul 2016 21:07:30 +0000 (21:07 +0000)]
Merge "Add way to set live wallpaper across users" into nyc-mr1-dev
Ashutosh Joshi [Fri, 15 Jul 2016 20:46:22 +0000 (13:46 -0700)]
Loading NanoApps now works.
Fixing transaction handling for loading/unloading nanoApps.
Bug:
30165105
Change-Id: I540243d730040e70b2d104ccd9ea5a0baaa0d97d
Cheryl Potter [Fri, 15 Jul 2016 20:41:57 +0000 (13:41 -0700)]
docs: Add redirect for new AS Help menu item
b/
30165151
Change-Id: I23cebb22ab697f750846cccb2eb42088a22f1cc9
Makoto Onuki [Fri, 15 Jul 2016 20:23:54 +0000 (13:23 -0700)]
Fix the allowed icon type error message
Bug
30162778
Change-Id: I925c563c1924c6525fe17afc44626d62864ba7e1
Mike Tsao [Fri, 15 Jul 2016 16:54:07 +0000 (09:54 -0700)]
Back up Night Light settings
Bug:
30150787
Change-Id: I79697b41b68e0f123de20e7b8782c6058bef7977
Daniel Yu [Fri, 15 Jul 2016 20:09:41 +0000 (20:09 +0000)]
Merge \"docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5\" into nyc-dev
am:
344a7375d7
Change-Id: Ia090eda73ad984c7e15a94c9b318e3a314fe0582
Andreas Gampe [Wed, 13 Jul 2016 05:42:41 +0000 (22:42 -0700)]
Frameworks/base: Add compiler stats to Package Manager
Add a simple class for storing compiler statistics. Capture compile
times for code paths from a package.
Bug:
29223204
Change-Id: I1b066de6a83a739470a42480eee0bfef88423eea
Dan Yu [Fri, 15 Jul 2016 19:59:56 +0000 (19:59 +0000)]
Merge "docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus() and Direct Boot for DP5" into nyc-dev
Makoto Onuki [Fri, 15 Jul 2016 01:14:08 +0000 (18:14 -0700)]
Cache the default launcher.
Originally we always checked with PM for the default launcher,
which would take ~2ms.
Now we cache the result, and clears the cache when (any) preferred
activities change.
Bug
30126557
Change-Id: Iceef288cd372c8bb9b119aa493e5173d894f2302
Svetoslav Ganov [Fri, 15 Jul 2016 19:56:41 +0000 (19:56 +0000)]
Merge "Prevent apps to overlay other apps via toast windows" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 19:52:08 +0000 (19:52 +0000)]
Merge "Reduce contention of ApplicationsState locks" into nyc-mr1-dev
Vineeta Srivastava [Fri, 15 Jul 2016 19:44:44 +0000 (19:44 +0000)]
Merge "Add carrier config to report IMEI on CDMA phone." into nyc-mr1-dev
Andrew Solovay [Thu, 14 Jul 2016 22:20:36 +0000 (15:20 -0700)]
docs: Added support library 24.1.0
See first comment for doc stage location.
bug:
30143483
Change-Id: Id74e29c45421b48a3de7218dccc504f2136dff5d
TreeHugger Robot [Fri, 15 Jul 2016 19:08:10 +0000 (19:08 +0000)]
Merge "Align empty views for quicksetting center in detail panel." into nyc-mr1-dev
Junda Liu [Thu, 14 Jul 2016 20:55:03 +0000 (13:55 -0700)]
Add carrier config to report IMEI on CDMA phone.
Bug: b/
29340579
Change-Id: I3cac49af4b173f971b8153c00227141378f32b43
Kevin Hufnagle [Fri, 15 Jul 2016 18:58:07 +0000 (18:58 +0000)]
Merge \"docs: Added note about limited support for hardware key attestation\" into nyc-dev
am:
68b98bc608
Change-Id: I1ae42e82f830ac939491c7d754d71420ec2092d9
Andrew Solovay [Thu, 14 Jul 2016 22:51:58 +0000 (15:51 -0700)]
docs: Updating image download pages for DP5
Updating with current images, which I've also uploaded to the cloud
share. I briefly made the cloud share public, so I could test the
download links and verify the checksums on the web page against the
downloaded files; the downloads and checksums all worked, so I made
the cloud files private again (so the links in these pages don't
work at the moment).
Also updated the download tables in the internationalized versions
of these files, since it's just a copy/paste.
See first comment for doc stage location.
bug:
29738757
Change-Id: I384786dcdf0dd249be0d1d0e38c88fa2b2109e0b
Kevin Hufnagle [Fri, 15 Jul 2016 18:44:09 +0000 (18:44 +0000)]
Merge "docs: Added note about limited support for hardware key attestation" into nyc-dev
Daniel Yu [Wed, 13 Jul 2016 19:12:59 +0000 (12:12 -0700)]
docs: Adding update for DevicePolicyManager.getStorageEncryptionStatus()
and Direct Boot for DP5
getStorageEncryptionStatus() now returns new
ENCRYPTION_STATUS_ACTIVE_PER_USER if the device is not
using direct boot (and the not-new ENCRYPTION_STATUS_ACTIVE
is returned if direct boot is used)
Bug:
30112425
Change-Id: I27c11b2afe2afd9a19c9f8268f486b09af22e6ac
TreeHugger Robot [Fri, 15 Jul 2016 18:26:50 +0000 (18:26 +0000)]
Merge "Always return valid ClipDescription for ACTION_DRAG_EXITED" into nyc-mr1-dev
Chong Zhang [Fri, 15 Jul 2016 18:26:27 +0000 (18:26 +0000)]
Merge "Don't release surface if relayout is visible" into nyc-mr1-dev
Adrian Roos [Fri, 15 Jul 2016 18:24:27 +0000 (18:24 +0000)]
Merge "Add ApplicationErrorReport tests" into nyc-mr1-dev
Adrian Roos [Thu, 14 Jul 2016 21:19:55 +0000 (14:19 -0700)]
Add way to set live wallpaper across users
Also adds an entry point for vendor specific services
to SystemUI.
Bug:
30038484
Change-Id: I8f335c1f7de15d619f2c688a8ac95372f166595f
Ruben Brunk [Fri, 15 Jul 2016 18:09:34 +0000 (18:09 +0000)]
Merge "Remove VR package disable logic." into nyc-mr1-dev
Chris Tate [Fri, 15 Jul 2016 18:05:06 +0000 (18:05 +0000)]
Merge "Turn down restore-time logspam" into nyc-mr1-dev
Christopher Tate [Fri, 15 Jul 2016 17:53:15 +0000 (10:53 -0700)]
Turn down restore-time logspam
Bug
30160827
Change-Id: I14ccf0a31e5a6882bf189c28c79d1c139ec44bcc
Jason Monk [Fri, 15 Jul 2016 17:54:42 +0000 (13:54 -0400)]
Reduce contention of ApplicationsState locks
Change-Id: I5b2ad52b014eea5bdf77526554eb10f4ba303105
Fixes:
30113789
Fan Zhang [Fri, 15 Jul 2016 17:39:03 +0000 (10:39 -0700)]
Align empty views for quicksetting center in detail panel.
Change-Id: I6d0f1eaeee1ea59890cf0589381332a3f3a8fb4e
Fixes:
29981651
Bert McMeen [Fri, 15 Jul 2016 17:19:42 +0000 (17:19 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51 am:
274d904d4c
am:
8432d4328d
Change-Id: I65edec2172b347df56a4be699060bd456cfe3923
Bert McMeen [Fri, 15 Jul 2016 17:14:06 +0000 (17:14 +0000)]
Docs: Behavior changes such as activity dismissal am:
f506485b51
am:
274d904d4c
Change-Id: I2bf5f981b7b8b001ce3d25ff0179270e23d08588
Bert McMeen [Fri, 15 Jul 2016 17:08:31 +0000 (17:08 +0000)]
Docs: Behavior changes such as activity dismissal
am:
f506485b51
Change-Id: Ia133aef14f006a15304ca744d933eb8934c80bb5
Jason Monk [Fri, 15 Jul 2016 16:55:22 +0000 (16:55 +0000)]
Merge "QS: Don't use ComponentName to identify tiles" into nyc-mr1-dev
Esteban Talavera [Fri, 15 Jul 2016 16:14:20 +0000 (16:14 +0000)]
Merge "Disallow user to block notification from OobConfig" into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 16:04:17 +0000 (16:04 +0000)]
Merge "QS Detail: Don't animate switch before panel open" into nyc-mr1-dev
Pankaj Kanwar [Fri, 15 Jul 2016 15:10:26 +0000 (15:10 +0000)]
Merge "Add alternative EXTRA_CALL_RAT_TYPE definition for noncompliant modems." into nyc-mr1-dev
Jason Monk [Fri, 15 Jul 2016 14:37:07 +0000 (10:37 -0400)]
QS Detail: Don't animate switch before panel open
This will make it more obvious that wifi gets turned on by opening
the panel as the animation of the state change will be visible.
Change-Id: I6ceb0bef914a9ff368b1bdb750d19aeb43593e78
Fixes:
29057528
Julia Reynolds [Fri, 15 Jul 2016 14:34:21 +0000 (14:34 +0000)]
Merge \\\\\"Check caller\\\\\'s uid before allowing notification policy access.\\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89 am:
e1d8b98189 -s ours
am:
8e6b7c2f72
Change-Id: I0d01f75f3ba19142675de8c589071af9888deeab
Julia Reynolds [Fri, 15 Jul 2016 14:27:24 +0000 (14:27 +0000)]
Merge \\\\"Check caller\\\\'s uid before allowing notification policy access.\\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c am:
5c6db3af89
am:
e1d8b98189 -s ours
Change-Id: I583fa066aaf12cacb841b10f751ad0ad7a1de237
Julia Reynolds [Fri, 15 Jul 2016 14:17:56 +0000 (14:17 +0000)]
Merge \\\"Check caller\\\'s uid before allowing notification policy access.\\\" into mnc-dev am:
234e1c25e4 am:
8e8bb6633c
am:
5c6db3af89
Change-Id: Ie212c6105f8796f0e7c4ccf25ea132b8c9f99519