OSDN Git Service
Bill Yi [Sat, 5 Nov 2016 06:47:55 +0000 (06:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
b14995516a -s ours
am:
9fbeb40fc9 -s ours
Change-Id: If318447c1a74e2bf80522b2e866e4bf3b7c7c667
Bill Yi [Sat, 5 Nov 2016 06:47:04 +0000 (06:47 +0000)]
Import translations. DO NOT MERGE am:
4d67c3b986 -s ours
am:
34485976f4 -s ours
Change-Id: I468134a01d8c75388ef264b074d8e7337e79b42d
Bill Yi [Sat, 5 Nov 2016 06:46:11 +0000 (06:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
86875e592a -s ours
am:
fbe8eef154 -s ours
Change-Id: Ic8550bb43ae2e9eaf74e10d8d1976bbb39876176
Bill Yi [Sat, 5 Nov 2016 06:45:22 +0000 (06:45 +0000)]
Import translations. DO NOT MERGE am:
d6a229b64c -s ours
am:
77cf704647 -s ours
Change-Id: Ibad84fdc51f710ae592e9592c74ae9eb4c96499b
Bill Yi [Sat, 5 Nov 2016 06:44:31 +0000 (06:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
53c2954e4e -s ours
am:
8d518cac98 -s ours
Change-Id: I9dd822ec13d9ebb3933e1ea0b6a5c9f72700c569
Bill Yi [Sat, 5 Nov 2016 06:43:41 +0000 (06:43 +0000)]
Import translations. DO NOT MERGE am:
92ba705e9f -s ours
am:
c7bfce0dda -s ours
Change-Id: Ie216dd1aaa6f188cf137c3d4d5fb6d83da0544cb
Bill Yi [Sat, 5 Nov 2016 06:42:50 +0000 (06:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
dfe1833475 -s ours
am:
e8dff1a5bd -s ours
Change-Id: I7afd465a8c51b43936a6c3efec210564f06db49d
Bill Yi [Sat, 5 Nov 2016 06:41:59 +0000 (06:41 +0000)]
Import translations. DO NOT MERGE am:
66333161bb -s ours
am:
77b50cef75 -s ours
Change-Id: Ie77db5506e553ab6280babbccb8aabf8bbd27cb7
Bill Yi [Sat, 5 Nov 2016 06:36:57 +0000 (06:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
b26e27dc4a -s ours
am:
f6e16b8604 -s ours
Change-Id: Idc09dc274841228ccce97d9613438df2fa210ec7
Bill Yi [Sat, 5 Nov 2016 06:36:04 +0000 (06:36 +0000)]
Import translations. DO NOT MERGE am:
0c1f10dd0c -s ours
am:
eff51c8add -s ours
Change-Id: Ie3011999ec010370e5419520c225390132fa5b02
Bill Yi [Sat, 5 Nov 2016 06:35:18 +0000 (06:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
04812a6025 -s ours
am:
7d0d794b6d -s ours
Change-Id: I360f2bf941318eff00eb2d506e6891ad24cae7bd
Bill Yi [Sat, 5 Nov 2016 06:34:29 +0000 (06:34 +0000)]
Import translations. DO NOT MERGE am:
b95efc83d1 -s ours
am:
6a928ed074 -s ours
Change-Id: Ib67371533356e5a27b1bf372d48d56027c6aa59c
Bill Yi [Sat, 5 Nov 2016 06:33:32 +0000 (06:33 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
79de6da289 -s ours
am:
e8dba1f819 -s ours
Change-Id: Ie3a3eb70d555313a9bf2f794349e2aaa3e3162cb
Bill Yi [Sat, 5 Nov 2016 06:32:51 +0000 (06:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
b14995516a -s ours
Change-Id: Ibfd1760a251c164b392fb64640fc0c39e4ac0556
Bill Yi [Sat, 5 Nov 2016 06:32:45 +0000 (06:32 +0000)]
Import translations. DO NOT MERGE
am:
4d67c3b986 -s ours
Change-Id: If8b7a3fe0740c2915784b457ef596e690f4c66c1
Bill Yi [Sat, 5 Nov 2016 06:32:37 +0000 (06:32 +0000)]
Import translations. DO NOT MERGE am:
fa38b27d50 -s ours
am:
345d96ec9d -s ours
Change-Id: I02900c7dcc8c60a588e776d456a2d9b3b7369bb7
Bill Yi [Sat, 5 Nov 2016 06:31:41 +0000 (06:31 +0000)]
Import translations. DO NOT MERGE am:
c08a721c3a -s ours
am:
10f695e379 -s ours
Change-Id: I2d628a2e6162c92aa55cf8292180f13a9a2908f1
Bill Yi [Sat, 5 Nov 2016 06:31:33 +0000 (06:31 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
86875e592a -s ours
Change-Id: I795e3260079e0cbba134235b7315ff4cbe67342a
Bill Yi [Sat, 5 Nov 2016 06:31:29 +0000 (06:31 +0000)]
Import translations. DO NOT MERGE
am:
d6a229b64c -s ours
Change-Id: Ib986b70036410e4ad561a724263a078117d0b09d
Bill Yi [Sat, 5 Nov 2016 06:30:05 +0000 (06:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
53c2954e4e -s ours
Change-Id: Ic20ae6533f3c84702779046b4d0edfa6da17c228
Bill Yi [Sat, 5 Nov 2016 06:30:01 +0000 (06:30 +0000)]
Import translations. DO NOT MERGE
am:
92ba705e9f -s ours
Change-Id: Ic918cea2b37e09957f22467160225069bee70a67
Bill Yi [Sat, 5 Nov 2016 06:28:33 +0000 (06:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
dfe1833475 -s ours
Change-Id: I1a6ca6a0a9dc9b4ee03bc6413ea0048118b9777c
Bill Yi [Sat, 5 Nov 2016 06:28:27 +0000 (06:28 +0000)]
Import translations. DO NOT MERGE
am:
66333161bb -s ours
Change-Id: I9c0463771fcd102c7cef8dc6d8948829ead49de4
Bill Yi [Sat, 5 Nov 2016 06:27:05 +0000 (06:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
b26e27dc4a -s ours
Change-Id: Ia37c90a128225718bc64f103382a0c7c7f35b635
Bill Yi [Sat, 5 Nov 2016 06:26:59 +0000 (06:26 +0000)]
Import translations. DO NOT MERGE
am:
0c1f10dd0c -s ours
Change-Id: Ia455a09086cac4a22b87591901562cf8e8ccf433
Bill Yi [Sat, 5 Nov 2016 06:24:03 +0000 (06:24 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
04812a6025 -s ours
Change-Id: I35dce809cd8ce72a471b362c90c95cacb5f5036a
Bill Yi [Sat, 5 Nov 2016 06:23:53 +0000 (06:23 +0000)]
Import translations. DO NOT MERGE
am:
b95efc83d1 -s ours
Change-Id: Ic6e7765e80c6ecd859b2b6508896ec38002dafc4
Bill Yi [Sat, 5 Nov 2016 06:22:12 +0000 (06:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
79de6da289 -s ours
Change-Id: I3dbae601af7f519aa58082f22b2e5a32b335b684
Bill Yi [Sat, 5 Nov 2016 06:22:02 +0000 (06:22 +0000)]
Import translations. DO NOT MERGE
am:
fa38b27d50 -s ours
Change-Id: I65a1609fcc6fbdd2ae3276e93f912c093fff539e
Bill Yi [Sat, 5 Nov 2016 06:20:46 +0000 (06:20 +0000)]
Import translations. DO NOT MERGE
am:
c08a721c3a -s ours
Change-Id: Ie1bd12ee925f08a7acdae5beab597ca26f7b0d5d
TreeHugger Robot [Sat, 5 Nov 2016 06:18:31 +0000 (06:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Sat, 5 Nov 2016 06:18:09 +0000 (06:18 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Sat, 5 Nov 2016 06:17:41 +0000 (06:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Sat, 5 Nov 2016 06:17:21 +0000 (06:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Sat, 5 Nov 2016 06:16:42 +0000 (06:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Sat, 5 Nov 2016 06:16:23 +0000 (06:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Sat, 5 Nov 2016 06:15:47 +0000 (06:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Sat, 5 Nov 2016 04:52:09 +0000 (21:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I368b83de3f1f69d4e5a0d1aa8924105f4090a2bc
Auto-generated-cl: translation import
Bill Yi [Sat, 5 Nov 2016 03:39:08 +0000 (20:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I36614103268c84b6660650ce9439b67a8df5041c
Auto-generated-cl: translation import
Bill Yi [Sat, 5 Nov 2016 03:36:04 +0000 (20:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaa17b7930409ee4512ee5140c80ceb130c46aed8
Auto-generated-cl: translation import
Bill Yi [Sat, 5 Nov 2016 03:11:23 +0000 (20:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I284c18a1b8cf79d9f8f6c67c0f6995509e39e8a8
Auto-generated-cl: translation import
Bill Yi [Sat, 5 Nov 2016 03:08:27 +0000 (20:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I790bcc1b99b5838ac6ac1ff90b1090e90ee659fa
Auto-generated-cl: translation import
Bill Yi [Sat, 5 Nov 2016 03:05:23 +0000 (20:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3e8e29579c2263ca2642bf70d0b8d25601452221
Auto-generated-cl: translation import
Bill Yi [Sat, 5 Nov 2016 02:47:41 +0000 (19:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id49e895ef1a65186b5fd86a156a639162bc83889
Auto-generated-cl: translation import
Bill Yi [Sat, 5 Nov 2016 02:34:22 +0000 (19:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifa12e3224bade004158f78961e24408469a24a26
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 5 Nov 2016 01:22:18 +0000 (01:22 +0000)]
Merge "Reference colorspace during creation of SkImageInfo"
Colin Cross [Sat, 5 Nov 2016 00:39:52 +0000 (00:39 +0000)]
Merge "Move one more libandroidfw header" am:
c5c74f9f49 am:
e81eb61399 am:
e1166dd488
am:
6d79e832fb -s ours
Change-Id: Icc4c7600d2ce3f33dc7ed7f1e8bc2dbd0fbfec98
Colin Cross [Sat, 5 Nov 2016 00:28:44 +0000 (00:28 +0000)]
Merge "Move one more libandroidfw header" am:
c5c74f9f49 am:
e81eb61399
am:
e1166dd488
Change-Id: I51b65b4eeea32af133ee9fb0528761d8fad2c5e6
Colin Cross [Sat, 5 Nov 2016 00:21:41 +0000 (00:21 +0000)]
Merge "Move one more libandroidfw header" am:
c5c74f9f49
am:
e81eb61399
Change-Id: I813a1f3c40681c92c7cc7bc27afd1344c15d0792
Colin Cross [Sat, 5 Nov 2016 00:15:01 +0000 (00:15 +0000)]
Merge "Move one more libandroidfw header"
am:
c5c74f9f49
Change-Id: Ib4d1c81aba13543da2454140548252cf013c95e1
Colin Cross [Sat, 5 Nov 2016 00:05:38 +0000 (00:05 +0000)]
Merge "Move one more libandroidfw header"
Jeff Sharkey [Fri, 4 Nov 2016 23:32:11 +0000 (23:32 +0000)]
Merge "Give easy flag to disable Direct Boot emulation."
Colin Cross [Fri, 4 Nov 2016 22:48:13 +0000 (15:48 -0700)]
Move one more libandroidfw header
The libandroidfw headers were moved into the library directory, move one
more that did not exist in the original patch.
Test: builds
Change-Id: Ic74a41558e1bc3984d98dd766f69d081edd8fc08
TreeHugger Robot [Fri, 4 Nov 2016 22:24:07 +0000 (22:24 +0000)]
Merge "Move IActivityManager to aidl."
John Reck [Fri, 4 Nov 2016 22:06:01 +0000 (22:06 +0000)]
Merge "Re-unite sources with their headers" am:
e43444a00b am:
946d11d216 am:
b365b0db93
am:
68227128ac -s ours
Change-Id: Iaf5274b7151a42617f7a19c4e98cbd8829e8b612
John Reck [Fri, 4 Nov 2016 21:57:05 +0000 (21:57 +0000)]
Merge "Re-unite sources with their headers" am:
e43444a00b am:
946d11d216
am:
b365b0db93
Change-Id: I5cbc54ea69e627a286fa1a2f855102146c3e044f
Marco Nelissen [Fri, 4 Nov 2016 21:53:53 +0000 (21:53 +0000)]
Merge "Use libaudioclient"
John Reck [Fri, 4 Nov 2016 21:52:43 +0000 (21:52 +0000)]
Merge "Re-unite sources with their headers" am:
e43444a00b
am:
946d11d216
Change-Id: Ib9fac5fff2f2ce90eebc2c6eb5208de33ea28723
John Reck [Fri, 4 Nov 2016 21:47:34 +0000 (21:47 +0000)]
Merge "Re-unite sources with their headers"
am:
e43444a00b
Change-Id: I8f3ef6a1ddcf78d28f7444b6e83c552b8305fd8c
Chad Brubaker [Fri, 4 Nov 2016 21:46:11 +0000 (21:46 +0000)]
Merge "Move ephemeral apps into the ephemeral SELinux domain"
Fyodor Kupolov [Fri, 4 Nov 2016 21:44:13 +0000 (21:44 +0000)]
Merge "Do not call parseInt if value is empty"
Treehugger Robot [Fri, 4 Nov 2016 21:41:01 +0000 (21:41 +0000)]
Merge "Re-unite sources with their headers"
Stephen Chen [Fri, 4 Nov 2016 21:29:30 +0000 (21:29 +0000)]
Merge "Implement metered tracking for NetworkStats summary queries."
TreeHugger Robot [Fri, 4 Nov 2016 20:50:32 +0000 (20:50 +0000)]
Merge "Unhide findPath() API. Add JavaDoc to related features."
Jeff Sharkey [Fri, 4 Nov 2016 20:45:24 +0000 (14:45 -0600)]
Give easy flag to disable Direct Boot emulation.
Direct Boot emulation is encouraged to help developers test their
apps, but it's not required.
Test: cts-tradefed run cts-dev --module CtsAppSecurityHostTestCases --test android.appsecurity.cts.DirectBootHostTest#testDirectBootEmulated
Bug:
30686636
Change-Id: I3bb2dd42c0f71e52d8b7cf8da7e50568f41aafb7
John Reck [Thu, 3 Nov 2016 23:16:47 +0000 (16:16 -0700)]
Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.
Also fixes -Werror issues that resulted in
no longer being -isystem.
Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
Merged-In: Ic4312eb61b197af114dded5691d5ae1ec82923f7
(cherry picked from commit
f6113af2d6f6eebee68d3ac510fe96d38a7a39e9)
Michael Kwan [Fri, 4 Nov 2016 20:13:08 +0000 (20:13 +0000)]
Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev am:
eed332bada -s ours am:
0c94d19c5d -s ours
am:
3045e6a3c7 -s ours
Change-Id: I53c09365ec2d81aa5147c00e9ec3b931dcc15778
Michael Kwan [Fri, 4 Nov 2016 20:11:58 +0000 (20:11 +0000)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am:
ef945b6706 -s ours am:
db5045a8ba -s ours
am:
aa3e93e397 -s ours
Change-Id: Ie1235a96130bffffd3e180a52c35fcff4a04ef24
Michael Kwan [Fri, 4 Nov 2016 20:06:22 +0000 (20:06 +0000)]
Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev am:
eed332bada -s ours
am:
0c94d19c5d -s ours
Change-Id: I767afec1a2633ac5fd5daf8b4cceeb8169a22bbe
Michael Kwan [Fri, 4 Nov 2016 20:05:25 +0000 (20:05 +0000)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am:
ef945b6706 -s ours
am:
db5045a8ba -s ours
Change-Id: I472face3a8e08b5ddc38cd2197469535cc89fe91
Michael Kwan [Fri, 4 Nov 2016 19:58:21 +0000 (19:58 +0000)]
Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev
am:
eed332bada -s ours
Change-Id: Ic30714c06a0865911c0e08682ccddd5d4b9ee6dc
Michael Kwan [Fri, 4 Nov 2016 19:58:19 +0000 (19:58 +0000)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
am:
ef945b6706 -s ours
Change-Id: I2bcd82f58f9727a2ef51936738494b19fb6e2922
TreeHugger Robot [Fri, 4 Nov 2016 19:51:40 +0000 (19:51 +0000)]
Merge "Filter external setting intents using IA_SETTING keyword."
TreeHugger Robot [Fri, 4 Nov 2016 19:49:23 +0000 (19:49 +0000)]
Merge "DO NOT MERGE ANYWHERE Add supports-multiwindow command to am." into cw-f-dev
Sudheer Shanka [Fri, 4 Nov 2016 19:38:06 +0000 (19:38 +0000)]
Merge "Fix IMountService transaction ids."
Phil Weaver [Fri, 4 Nov 2016 19:37:36 +0000 (19:37 +0000)]
Merge "Add check for null manger for a11y recents action"
Michael Kwan [Fri, 4 Nov 2016 19:34:29 +0000 (19:34 +0000)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am:
040b4826c2 -s ours am:
b22ba03e85 -s ours am:
82fe47cc44 -s ours
am:
5822211aee -s ours
Change-Id: I4aac99236edc24f46145cabbf805bddc321321ee
John Reck [Fri, 4 Nov 2016 19:32:03 +0000 (19:32 +0000)]
Merge "Re-unite sources with their headers"
Michael Kwan [Fri, 4 Nov 2016 19:29:03 +0000 (19:29 +0000)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am:
040b4826c2 -s ours am:
b22ba03e85 -s ours
am:
82fe47cc44 -s ours
Change-Id: Ib062b926972a8931ce13021a4aa8a1ba4d9d54af
Michael Kwan [Fri, 4 Nov 2016 19:21:16 +0000 (19:21 +0000)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am. am:
040b4826c2 -s ours
am:
b22ba03e85 -s ours
Change-Id: I26322338d505313fe492126b892d64a329c147f5
Michael Kwan [Fri, 4 Nov 2016 19:14:41 +0000 (19:14 +0000)]
DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
am:
040b4826c2 -s ours
Change-Id: I5b476dd054dab199135b3e8bb088d83d665e7be7
Android Build Merger (Role) [Fri, 4 Nov 2016 19:09:38 +0000 (19:09 +0000)]
Merge "Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev am:
e50a485c22 am:
d4ef6421e5 am:
52df5e2c1b"
Greg Plesur [Fri, 4 Nov 2016 19:08:58 +0000 (19:08 +0000)]
Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev am:
e50a485c22 am:
d4ef6421e5
am:
52df5e2c1b
Change-Id: I228a69981d2e7ec215bdbb31d66c3a4b37e70e56
TreeHugger Robot [Fri, 4 Nov 2016 19:08:26 +0000 (19:08 +0000)]
Merge "Add supports-multiwindow command to am."
Greg Plesur [Fri, 4 Nov 2016 19:04:36 +0000 (19:04 +0000)]
Merge "resolve merge conflicts of
c874e60 to master"
Paulo Casanova [Fri, 4 Nov 2016 18:47:21 +0000 (18:47 +0000)]
Merge "Renamed Aapt2.java to Aapt2Jni.java."
Sudheer Shanka [Sat, 22 Oct 2016 00:55:27 +0000 (17:55 -0700)]
Move IActivityManager to aidl.
Bug:
30977067
Test: Existing tests are passing, dump commands still working.
Change-Id: I9cf81c4d381ebce14a6c701e409cbb269f2ff1fb
TreeHugger Robot [Fri, 4 Nov 2016 17:01:00 +0000 (17:01 +0000)]
Merge "Send BOOT_COMPLETED when updating system apps"
Stephen Chen [Fri, 21 Oct 2016 19:44:26 +0000 (12:44 -0700)]
Implement metered tracking for NetworkStats summary queries.
Dependent on ag/
1550196 where API is defined.
Bug:
31015360
Bug:
26545374
Test: runtest --path
frameworks/base/core/tests/coretests/src/android/net/NetworkStatsTest.java,
other test classes.
Change-Id: I968b9e3352d7880e3fc438f12de628a2da057e0a
Fan Zhang [Wed, 2 Nov 2016 22:54:53 +0000 (15:54 -0700)]
Filter external setting intents using IA_SETTING keyword.
Also add test for CategoryKey
Bug:
32382487
Bug:
32460089
Test: make RunSettingsLibRoboTests
Change-Id: I0ed6278344a545b5fc952f5811322857382e4b60
Manu Cornet [Fri, 4 Nov 2016 16:39:01 +0000 (16:39 +0000)]
Merge "Slightly better encapsulation for the set of recent activities"
Greg Plesur [Fri, 4 Nov 2016 16:34:30 +0000 (12:34 -0400)]
resolve merge conflicts of
c874e60 to master
Change-Id: I39381c516e4a1267d06e3f7b682d1cf73eeb6f9b
TreeHugger Robot [Fri, 4 Nov 2016 16:12:19 +0000 (16:12 +0000)]
Merge "Never use getApplicationInfo."
Jack Yu [Fri, 4 Nov 2016 16:03:09 +0000 (16:03 +0000)]
Merge "Added CMAS/ETWS duplicate expiration support" into nyc-mr2-dev am:
e966a97113
am:
250d0c402f
Change-Id: Ieb0d0742331e0ea3afed83b49e738cb3c9badbbd
Jack Yu [Fri, 4 Nov 2016 16:02:14 +0000 (16:02 +0000)]
Added CMAS/ETWS duplicate expiration support am:
f8247928a2
am:
4461e96abb
Change-Id: I7a7e85f88e05f1dec1c83a9b41138534afc02269
Greg Plesur [Fri, 4 Nov 2016 15:57:57 +0000 (15:57 +0000)]
Merge "If the current device is a watch, fix DeviceOwner/ProfileOwner logic." into cw-f-dev am:
e50a485c22
am:
d4ef6421e5
Change-Id: I6b1b41e844c72573dd7c5de51b6e9a63b590b632
Greg Plesur [Fri, 4 Nov 2016 15:56:54 +0000 (15:56 +0000)]
If the current device is a watch, fix DeviceOwner/ProfileOwner logic. am:
34fb70ab88
am:
9ee91d8d11
Change-Id: Ibf15871a6d0ca3219ebf32de89a42c9d680c427a
Jack Yu [Fri, 4 Nov 2016 15:55:21 +0000 (15:55 +0000)]
Merge "Added CMAS/ETWS duplicate expiration support" into nyc-mr2-dev
am:
e966a97113
Change-Id: Ia7daaa128679ec50c7b85cb03737381535507aaa
Jack Yu [Fri, 4 Nov 2016 15:55:12 +0000 (15:55 +0000)]
Added CMAS/ETWS duplicate expiration support
am:
f8247928a2
Change-Id: Ic8ac9c15748ae2a5f22ab08df81ed501a8365bc0
Julia Reynolds [Fri, 4 Nov 2016 13:08:52 +0000 (09:08 -0400)]
Never use getApplicationInfo.
Always use getApplicationInfoAsUser.
Test: runtest, and install a work profile app and post a notification.
Bug:
32615127
Change-Id: I92cdf42d791d27eaff64b945be96b216e5866f6d
OSDN Git Service
