OSDN Git Service
Gopal Krishna Shukla [Fri, 23 Sep 2016 13:11:23 +0000 (13:11 +0000)]
Merge "Provide synchronization to setview to avoid NPE" am:
b05b93a674
am:
810c31fdca
Change-Id: Ibd664e4836eaceef8a4d8363793667afa757387a
Gopal Krishna Shukla [Fri, 23 Sep 2016 13:07:52 +0000 (13:07 +0000)]
Merge "Provide synchronization to setview to avoid NPE"
am:
b05b93a674
Change-Id: I92bec8af349cae5232e65d88938635a93f06fc6a
Treehugger Robot [Fri, 23 Sep 2016 12:57:57 +0000 (12:57 +0000)]
Merge "Provide synchronization to setview to avoid NPE"
Etan Cohen [Fri, 23 Sep 2016 04:16:50 +0000 (04:16 +0000)]
Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks." am:
bc3d106b97
am:
a29bcecad9
Change-Id: I622b78805d08a4e9c59e207598ebc5f3cbf8d135
Etan Cohen [Fri, 23 Sep 2016 04:07:30 +0000 (04:07 +0000)]
Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."
am:
bc3d106b97
Change-Id: I1019b5c514424043144351aa893b4f5048e4207e
Etan Cohen [Fri, 23 Sep 2016 03:59:40 +0000 (03:59 +0000)]
Merge "[NAN] Separate ATTACH from IDENTITY_CHANGE callbacks."
Christopher Wiley [Thu, 22 Sep 2016 23:59:48 +0000 (23:59 +0000)]
Merge changes from topic 'remove-set-frequency-band' am:
430904a4ab
am:
5135fb8f04
Change-Id: I949e65bb49ab35d01f41f9ff8df74c2a735c8675
Christopher Wiley [Thu, 22 Sep 2016 23:58:52 +0000 (23:58 +0000)]
Remove ability to set frequency from WifiAssociationTest am:
93ce63760d
am:
4bec7b53b0
Change-Id: I53df1fdc9bd9fb748756a5b75d9cf0063d9e443c
Christopher Wiley [Thu, 22 Sep 2016 23:57:42 +0000 (23:57 +0000)]
Remove WifiManager#get/setFrequencyBand am:
79ec1736be
am:
a7394a4a70
Change-Id: Ia990b8c209bf7002830f5147d2435a5151ed85f7
Christopher Wiley [Thu, 22 Sep 2016 23:52:02 +0000 (23:52 +0000)]
Merge changes from topic 'remove-set-frequency-band'
am:
430904a4ab
Change-Id: Iadf94f5e95f9a53c03115a44594f32aba21ecb4f
Christopher Wiley [Thu, 22 Sep 2016 23:51:57 +0000 (23:51 +0000)]
Remove ability to set frequency from WifiAssociationTest
am:
93ce63760d
Change-Id: I334fde9e45a6ca6bba6e6a2ec5d9f68f52e31e03
Christopher Wiley [Thu, 22 Sep 2016 23:50:58 +0000 (23:50 +0000)]
Remove WifiManager#get/setFrequencyBand
am:
79ec1736be
Change-Id: I9b5b298fc3e47e77a59701e7f9d4dc18680f12b8
Christopher Wiley [Thu, 22 Sep 2016 23:34:17 +0000 (23:34 +0000)]
Merge changes from topic 'remove-set-frequency-band'
* changes:
Remove ability to set frequency from WifiAssociationTest
Remove WifiManager#get/setFrequencyBand
Jaewan Kim [Thu, 22 Sep 2016 23:17:29 +0000 (23:17 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours am:
2cd4383c31 am:
09edfde074 am:
1ab448b5d5 am:
5b649ddcc6 -s ours
am:
e36701214a
Change-Id: I45ecf1f660e94ef5487711b13d43f38931fb9447
Jaewan Kim [Thu, 22 Sep 2016 23:08:31 +0000 (23:08 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours am:
e9a9e2f055 am:
351aa0b320 am:
03bad07418 am:
afab98a69e -s ours
am:
738c21253a
Change-Id: Ic596aa2c09ff2a3443020d24996bfd535413e4d8
Jaewan Kim [Thu, 22 Sep 2016 23:08:24 +0000 (23:08 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours am:
2cd4383c31 am:
09edfde074 am:
1ab448b5d5
am:
5b649ddcc6 -s ours
Change-Id: I7de1101955e5152cd1fb5858ac93c9e94697b01b
Pavlin Radoslavov [Thu, 22 Sep 2016 22:57:06 +0000 (22:57 +0000)]
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind" am:
3b0256fc73
am:
829285c38e
Change-Id: I488915e4f0f8bcc9b90f61699f000831f2d393fe
Jaewan Kim [Thu, 22 Sep 2016 22:51:23 +0000 (22:51 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours am:
e9a9e2f055 am:
351aa0b320 am:
03bad07418
am:
afab98a69e -s ours
Change-Id: I8ddca6c69539eb9cc568e5fcec011a3c58450fcc
Colin Cross [Thu, 22 Sep 2016 22:51:08 +0000 (22:51 +0000)]
Merge "aapt: remove duplicate definition of ZD" am:
ac2d839d7c
am:
3efa1e7c17
Change-Id: Ie3109031c4a5499c6d5ff5e6ec097ab64c86d0b2
Jaewan Kim [Thu, 22 Sep 2016 22:40:32 +0000 (22:40 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours am:
2cd4383c31 am:
09edfde074
am:
1ab448b5d5
Change-Id: I4a1da4793ef9c53447742ea9e1f7a34fbffb8807
Pavlin Radoslavov [Thu, 22 Sep 2016 22:39:31 +0000 (22:39 +0000)]
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
am:
3b0256fc73
Change-Id: If33f7f2787ee94609e9fbb0ea52f66bdbdf57614
Jaewan Kim [Thu, 22 Sep 2016 22:39:30 +0000 (22:39 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours am:
e9a9e2f055 am:
351aa0b320
am:
03bad07418
Change-Id: Ia687cf7aa14eb11452d390d47bc13ba4dfba0cda
Jaewan Kim [Thu, 22 Sep 2016 22:27:37 +0000 (22:27 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours am:
2cd4383c31
am:
09edfde074
Change-Id: I8365e943aab82305fbc5775e8044dc7f014c0cdc
Jaewan Kim [Thu, 22 Sep 2016 22:26:12 +0000 (22:26 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours am:
e9a9e2f055
am:
351aa0b320
Change-Id: I4cfe42fedcde6f49f259686481bfe61660d02bfc
Jaewan Kim [Thu, 22 Sep 2016 22:21:52 +0000 (22:21 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81 am:
585f642d65 -s ours
am:
2cd4383c31
Change-Id: I0e6d2e4c60383c95a4a73bccfdb12472152e86a0
Jaewan Kim [Thu, 22 Sep 2016 22:20:54 +0000 (22:20 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9 am:
ed3e26e2be -s ours
am:
e9a9e2f055
Change-Id: Iaa0f0e473c9e2389c75c5d4dd9b4ff5e244ba442
Android Build Merger (Role) [Thu, 22 Sep 2016 21:57:54 +0000 (21:57 +0000)]
Merge "Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652 am:
bed7636243 am:
dd883c7e87 am:
832179120f -s ours am:
c547eeda12" into nyc-dev-plus-aosp
Jaewan Kim [Thu, 22 Sep 2016 21:57:09 +0000 (21:57 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652 am:
bed7636243 am:
dd883c7e87 am:
832179120f -s ours
am:
c547eeda12
Change-Id: I0163065681c16466114ee3329862bceb08c5ec4e
Jaewan Kim [Thu, 22 Sep 2016 21:56:51 +0000 (21:56 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79 am:
462493ee81
am:
585f642d65 -s ours
Change-Id: Ibbc592cb5fc2b035b87cbb89dcf5dee085c63e14
Android Build Merger (Role) [Thu, 22 Sep 2016 21:56:34 +0000 (21:56 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours am:
fa9983ec73 am:
900d1c90b3 am:
0e31d93890 am:
4da22f27f6 -s ours am:
36068a2f00" into nyc-dev-plus-aosp
Treehugger Robot [Thu, 22 Sep 2016 21:56:09 +0000 (21:56 +0000)]
Merge "Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind"
Jaewan Kim [Thu, 22 Sep 2016 21:55:59 +0000 (21:55 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours am:
fa9983ec73 am:
900d1c90b3 am:
0e31d93890 am:
4da22f27f6 -s ours
am:
36068a2f00
Change-Id: I2e7639c73505ad3016bef974fad7724c05e7e6b3
Jaewan Kim [Thu, 22 Sep 2016 21:55:51 +0000 (21:55 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9 am:
3ea1f124f9
am:
ed3e26e2be -s ours
Change-Id: Ie4fd67251243bba5f6c39320b752cd1cb9f8987e
liulvping [Thu, 22 Sep 2016 21:55:31 +0000 (21:55 +0000)]
Merge "Skip uninstalled package for getPackagesForUid()" am:
f4c8c3590a
am:
659cdfef75
Change-Id: I253117165d33dccc8544587968503f2ef61484c3
Colin Cross [Thu, 22 Sep 2016 21:55:27 +0000 (21:55 +0000)]
Merge "aapt: remove duplicate definition of ZD"
am:
ac2d839d7c
Change-Id: I7f2388c9f0cd649ef79db41c67a4f07cbb18a3c9
Treehugger Robot [Thu, 22 Sep 2016 21:24:46 +0000 (21:24 +0000)]
Merge "aapt: remove duplicate definition of ZD"
Android Build Merger (Role) [Thu, 22 Sep 2016 20:35:08 +0000 (20:35 +0000)]
Merge "Merge "Remove has_trivial_move trait from StringPool types" am:
d333f28397 am:
6f02f57f12" into nyc-dev-plus-aosp
Jaewan Kim [Thu, 22 Sep 2016 20:35:00 +0000 (20:35 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652 am:
bed7636243 am:
dd883c7e87
am:
832179120f -s ours
Change-Id: Iefcfa52c1a34b05102c7188b3e7232584cffba53
Jaewan Kim [Thu, 22 Sep 2016 20:34:22 +0000 (20:34 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours am:
ded4df2e79
am:
462493ee81
Change-Id: I822c5aeb87aea023aa8dba38a4beb6de98225f4a
Jaewan Kim [Thu, 22 Sep 2016 20:33:44 +0000 (20:33 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours am:
fa9983ec73 am:
900d1c90b3 am:
0e31d93890
am:
4da22f27f6 -s ours
Change-Id: Ie18197c55022197b4dcc9f8e2d45cb5cc78dcdd0
Colin Cross [Thu, 22 Sep 2016 20:33:25 +0000 (20:33 +0000)]
Merge "Remove has_trivial_move trait from StringPool types" am:
d333f28397
am:
6f02f57f12
Change-Id: Iba0bb317fb0df1e2c5189dde3743f21bdd00ec38
Jaewan Kim [Thu, 22 Sep 2016 20:33:24 +0000 (20:33 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours am:
499871ebe9
am:
3ea1f124f9
Change-Id: I6762900887ed8ec6afb5b787fc3a2426b846a6c1
Ajay Panicker [Thu, 22 Sep 2016 20:33:21 +0000 (20:33 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f am:
dc0f9fa9c9 -s ours am:
8919cc83bb -s ours am:
0241b6d88a am:
0fee65e58b am:
08fed21f2c -s ours am:
0029d03c0a am:
afeaced48f am:
2a214fc5f2 am:
0ec10c8fdc -s ours
am:
916552b0c9
Change-Id: Iacc0a20de196e47f351cc6010712b5ed4053ab77
liulvping [Thu, 22 Sep 2016 20:30:51 +0000 (20:30 +0000)]
Merge "Skip uninstalled package for getPackagesForUid()"
am:
f4c8c3590a
Change-Id: I1e4f7913cc00635611440faabcab4faff7f35dc5
Jaewan Kim [Thu, 22 Sep 2016 20:05:57 +0000 (20:05 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652 am:
bed7636243
am:
dd883c7e87
Change-Id: Id9a90d8d49724435fced962b42a89edbb90846c3
Jaewan Kim [Thu, 22 Sep 2016 20:05:49 +0000 (20:05 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev am:
fce3b76452 -s ours
am:
ded4df2e79
Change-Id: I16dd5912ae18ae4f25bdd9a8e2fa7d07ca8f1b61
Pavlin Radoslavov [Thu, 22 Sep 2016 00:28:11 +0000 (17:28 -0700)]
Removed MESSAGE_BIND_PROFILE_SERVICE messages on unbind
Add a missing call to remove all MESSAGE_BIND_PROFILE_SERVICE
message when unbinding and finishing.
Bug:
31442739
Test: manual, and "frameworks/base/core/tests/bluetoothtests" unit tests
Change-Id: I7e9a8f79a38d4eb8ab8b53be04650226fc72732e
Jaewan Kim [Thu, 22 Sep 2016 20:03:57 +0000 (20:03 +0000)]
DO NOT MERGE Fix build am:
dfedca4e43 -s ours
am:
499871ebe9
Change-Id: I7999092c3ba1df344f305b3e5d2befa65d1ad04a
Jaewan Kim [Thu, 22 Sep 2016 20:03:53 +0000 (20:03 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours am:
fa9983ec73 am:
900d1c90b3
am:
0e31d93890
Change-Id: I7f0dc285e10f6786137f6446dc77a53fe1549dfc
Treehugger Robot [Thu, 22 Sep 2016 20:00:01 +0000 (20:00 +0000)]
Merge "Skip uninstalled package for getPackagesForUid()"
Colin Cross [Thu, 22 Sep 2016 19:59:13 +0000 (19:59 +0000)]
Merge "Remove has_trivial_move trait from StringPool types"
am:
d333f28397
Change-Id: I6d606897a3edeb01425748105efeb86a43719226
Dirk Dougherty [Thu, 22 Sep 2016 19:57:05 +0000 (19:57 +0000)]
Copy IN files to ID, temporarily leaving IN in place.
am:
9bbc0a2421
Change-Id: I9810aa023e82d4ff8d59157c1ba42ce9e6e71dcc
Ajay Panicker [Thu, 22 Sep 2016 19:56:50 +0000 (19:56 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f am:
dc0f9fa9c9 -s ours am:
8919cc83bb -s ours am:
0241b6d88a am:
0fee65e58b am:
08fed21f2c -s ours am:
0029d03c0a am:
afeaced48f am:
2a214fc5f2
am:
0ec10c8fdc -s ours
Change-Id: I66bfa158fdf948f36a98c20c3afc7ee7d73bb920
Colin Cross [Thu, 22 Sep 2016 19:44:27 +0000 (19:44 +0000)]
Merge "Remove has_trivial_move trait from StringPool types"
Android Build Merger (Role) [Thu, 22 Sep 2016 19:24:04 +0000 (19:24 +0000)]
Merge "Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev am:
8b05feb5b4" into nyc-dev-plus-aosp
Android Build Merger (Role) [Thu, 22 Sep 2016 19:23:50 +0000 (19:23 +0000)]
Merge "Removing a temporary redirect for /ndk/guides/cmake.html am:
dafcbfa693" into nyc-dev-plus-aosp
Scott Main [Thu, 22 Sep 2016 19:23:12 +0000 (19:23 +0000)]
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev
am:
8b05feb5b4
Change-Id: Ib440e45e49b5c29120b57a4d28cb2760446a66d0
Ajay Panicker [Thu, 22 Sep 2016 19:23:06 +0000 (19:23 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f am:
dc0f9fa9c9 -s ours am:
8919cc83bb -s ours am:
0241b6d88a am:
0fee65e58b am:
08fed21f2c -s ours am:
0029d03c0a am:
afeaced48f
am:
2a214fc5f2
Change-Id: I95bd7f14d35808722c0453e6e441d3bc96528010
Adarsh Fernando [Thu, 22 Sep 2016 19:23:05 +0000 (19:23 +0000)]
Removing a temporary redirect for /ndk/guides/cmake.html
am:
dafcbfa693
Change-Id: I78e5adb6f17d391a16d2b4a8e00078e1390db446
yuanhuihui [Thu, 22 Sep 2016 19:21:50 +0000 (19:21 +0000)]
Merge "[ActivityManager] Reset killed flag at attachApplicationLocked" am:
1d5447d70b
am:
5820f7fff5
Change-Id: I6062fdf8a686fcb64340b26f8aa200d5506fb91c
Jaewan Kim [Thu, 22 Sep 2016 19:01:08 +0000 (19:01 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours am:
1c278e5652
am:
bed7636243
Change-Id: I7d0fdb9db8a0593fe279a119751c17f940f88925
Jaewan Kim [Thu, 22 Sep 2016 19:00:14 +0000 (19:00 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours am:
fa9983ec73
am:
900d1c90b3
Change-Id: I03db2d87943557beb6a98aa72f986c1ad0f7f03d
Jaewan Kim [Thu, 22 Sep 2016 18:09:45 +0000 (18:09 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev
am:
fce3b76452 -s ours
Change-Id: Iea1a397f79856070d5f801193c71721a8ff69936
Jaewan Kim [Thu, 22 Sep 2016 18:09:41 +0000 (18:09 +0000)]
DO NOT MERGE Fix build
am:
dfedca4e43 -s ours
Change-Id: Ibf95b4c061129b2cd047e3b8a8da9f90cfea7e8f
Ajay Panicker [Thu, 22 Sep 2016 18:07:40 +0000 (18:07 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f am:
dc0f9fa9c9 -s ours am:
8919cc83bb -s ours am:
0241b6d88a am:
0fee65e58b am:
08fed21f2c -s ours am:
0029d03c0a
am:
afeaced48f
Change-Id: I579d7384e9a12e942a0afcd80fc41e9f2877eedb
Jaewan Kim [Thu, 22 Sep 2016 17:46:56 +0000 (17:46 +0000)]
Merge "DO NOT MERGE Fix build" into lmp-dev
Jaewan Kim [Thu, 22 Sep 2016 05:56:33 +0000 (14:56 +0900)]
DO NOT MERGE Fix build
Bug:
29833954
Change-Id: Ia814969b516ac7cc0ad7431ebab40cc74fdf2a05
yuanhuihui [Thu, 22 Sep 2016 17:28:31 +0000 (17:28 +0000)]
Merge "[ActivityManager] Reset killed flag at attachApplicationLocked"
am:
1d5447d70b
Change-Id: Id51a6dabbf1fec793ca0a905454a412359e0cd57
Dirk Dougherty [Thu, 22 Sep 2016 17:21:29 +0000 (10:21 -0700)]
Copy IN files to ID, temporarily leaving IN in place.
Change-Id: I1a92e4254fe57817cb555629059539aaec47e182
Colin Cross [Thu, 22 Sep 2016 17:09:38 +0000 (10:09 -0700)]
Remove has_trivial_move trait from StringPool types
StringPool:entry* are not trivially moveable, as they contain Vector<>
objects. The data in Vector<> is trivially moveable, but Vector<>
itself is a dynamic type with a vtable, which is not trivially
moveable.
Impact on aapt for frameworks-res is negligible, ~3%.
Bug:
31595853
Test: m -j framework-res
Change-Id: I562a46ef8934aed7aab5c5377db53d9cf64a08b9
liulvping [Mon, 6 Jun 2016 02:20:48 +0000 (10:20 +0800)]
Skip uninstalled package for getPackagesForUid()
If a package with sharedUserId had been setInstalled
with false, then the result of getPackagesForUid()
should not include it.
https://code.google.com/p/android/issues/detail?id=212255
Change-Id: I7b984051db34ecc2d0ef9518786d51100ab9ac79
Signed-off-by: liulvping <liulvping@xiaomi.com>
Jaewan Kim [Thu, 22 Sep 2016 16:06:27 +0000 (16:06 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490 am:
6ad7c0f6ce -s ours
am:
1c278e5652
Change-Id: I2486a6238a2595d7bd84b31916e22987ea2f98d5
Ajay Panicker [Thu, 22 Sep 2016 15:45:36 +0000 (15:45 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
786e2694b1 am:
8fd324c33f am:
438cc52ca1 -s ours am:
7f84596929 -s ours am:
ed82c6fac8 am:
c1f8a09c1e am:
8091a00994 -s ours am:
bc12dda3a7 am:
ffe6090f7e am:
a71d1c416b am:
081bea189d -s ours
am:
34b14060c1
Change-Id: Ic244b4d46245675933fb6fb95a676e7d4659422e
Scott Main [Thu, 22 Sep 2016 15:22:38 +0000 (15:22 +0000)]
Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev
Treehugger Robot [Thu, 22 Sep 2016 14:54:16 +0000 (14:54 +0000)]
Merge "[ActivityManager] Reset killed flag at attachApplicationLocked"
Ajay Panicker [Thu, 22 Sep 2016 14:48:37 +0000 (14:48 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
786e2694b1 am:
8fd324c33f am:
438cc52ca1 -s ours am:
7f84596929 -s ours am:
ed82c6fac8 am:
c1f8a09c1e am:
8091a00994 -s ours am:
bc12dda3a7 am:
ffe6090f7e am:
a71d1c416b
am:
081bea189d -s ours
Change-Id: Ic3f72935e96e7b6f7b3a69474451d3edd418dd24
Jaewan Kim [Thu, 22 Sep 2016 14:23:38 +0000 (14:23 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb am:
7ffaaca237 -s ours
am:
fa9983ec73
Change-Id: I5e9cb821711f13d536af5d3d5d42595f0e286559
Ajay Panicker [Thu, 22 Sep 2016 14:22:50 +0000 (14:22 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
786e2694b1 am:
8fd324c33f am:
438cc52ca1 -s ours am:
7f84596929 -s ours am:
ed82c6fac8 am:
c1f8a09c1e am:
8091a00994 -s ours am:
bc12dda3a7 am:
ffe6090f7e
am:
a71d1c416b
Change-Id: Ib0ef4b276401795bbe64b35cf4caa9a173eaec21
Jaewan Kim [Thu, 22 Sep 2016 13:58:30 +0000 (13:58 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486 am:
1bf809c490
am:
6ad7c0f6ce -s ours
Change-Id: I71157581308c3ef4be7dad8db5c7d9a637a24320
Ajay Panicker [Thu, 22 Sep 2016 13:33:07 +0000 (13:33 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f am:
dc0f9fa9c9 -s ours am:
8919cc83bb -s ours am:
0241b6d88a am:
0fee65e58b am:
08fed21f2c -s ours
am:
0029d03c0a
Change-Id: Ia40c8390390d5612ad53c649d14516871bfba8e9
Ajay Panicker [Thu, 22 Sep 2016 13:32:52 +0000 (13:32 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
786e2694b1 am:
8fd324c33f am:
438cc52ca1 -s ours am:
7f84596929 -s ours am:
ed82c6fac8 am:
c1f8a09c1e am:
8091a00994 -s ours am:
bc12dda3a7
am:
ffe6090f7e
Change-Id: I6d48f72f00bd10d6013753db78883cec67c68568
Jaewan Kim [Thu, 22 Sep 2016 13:31:57 +0000 (13:31 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea am:
7eaeeb49bb
am:
7ffaaca237 -s ours
Change-Id: I1db1ad50bfd89c038f9d226109958011aeb1496e
Jaewan Kim [Thu, 22 Sep 2016 13:10:13 +0000 (13:10 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours am:
890f53a486
am:
1bf809c490
Change-Id: I0a316929c7654f89e435ac459bc9175434136f99
Jaewan Kim [Thu, 22 Sep 2016 12:37:05 +0000 (12:37 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am:
64b7b1522e -s ours am:
5abd69e59a am:
f7f452fd28 am:
8a168a7c5d -s ours am:
298c104ae5 am:
d9e8bfb8cf am:
8cb7a9fdb0 am:
a13096f4c5 -s ours
am:
36aa253b2b
Change-Id: I157f952036a5ee185878c883883c65a1011bcabf
Jaewan Kim [Thu, 22 Sep 2016 12:36:11 +0000 (12:36 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
4e9af38ec4 -s ours am:
031fb04776 am:
2d88f87a82 am:
64110c6bf1 -s ours am:
8d14f464b5 am:
f595add2ff am:
e1e6f0a7f5 am:
9632afe809 -s ours
am:
b96d410537
Change-Id: I9bad8dac7cca960aa1b0f4ce4764108a927d0370
Jaewan Kim [Thu, 22 Sep 2016 12:35:13 +0000 (12:35 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c am:
e47b5adce2 am:
bea0b3ec06 -s ours am:
91ccfa1def am:
4167620d33 am:
2c9ad0ff81 am:
b6d6519e34 -s ours
am:
61fda61d20
Change-Id: If9db6d86109457a4ab06b69eb7c1db35ef823127
Jaewan Kim [Thu, 22 Sep 2016 12:34:18 +0000 (12:34 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267 am:
709d112eca am:
6bf115121c -s ours am:
30d1440861 am:
ba1d8300be am:
016d110993 am:
1adff2ee05 -s ours
am:
78efad6418
Change-Id: Ibd5a21d2c5fd91ec9623c48e138aba61be373b23
Ajay Panicker [Thu, 22 Sep 2016 12:33:22 +0000 (12:33 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours am:
7cd1668893 am:
a5e128ba97 am:
94c08c2bed -s ours am:
d4fe288933 am:
f65661939b am:
630d577349 am:
c9830d56e5 -s ours
am:
c5442c263a
Change-Id: I478f37a9e43feda3ca5a6657ab66a7549e11c2c8
Ajay Panicker [Thu, 22 Sep 2016 12:32:25 +0000 (12:32 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours am:
57fdbb97a6 am:
2cf025f976 am:
9c7ac98157 -s ours am:
1448a693d8 am:
3d4c737736 am:
f6d8037708 am:
90eafb5322 -s ours
am:
b2a1dcb913
Change-Id: I420198b83b2b8480a87a6d55195b6f05ec06b057
Ajay Panicker [Thu, 22 Sep 2016 12:31:06 +0000 (12:31 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am:
447ac4b31d am:
4431d6cb5b am:
852e5a43b9 -s ours am:
a70fffe8e7 am:
d677e8d413 am:
73607db5a1 am:
05cd9942d9 -s ours
am:
745254f98b
Change-Id: I8204d26ad589a600a7e1cccc306266b1ab579c6a
Ajay Panicker [Thu, 22 Sep 2016 12:29:58 +0000 (12:29 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1 am:
8be4dc7e16 -s ours am:
c56c079470 am:
1783182332 am:
993015ce9a am:
8e172c638d -s ours
am:
9338ffa148
Change-Id: Iad6b7ac69088d60cf02cd9870e2520388d398767
Jaewan Kim [Thu, 22 Sep 2016 12:29:19 +0000 (12:29 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev am:
5b05226586 am:
b38fbf9894 am:
84ecab6059 -s ours am:
5ac79fa0a1 -s ours
am:
890f53a486
Change-Id: I7f85d8785ce8829cb9d01a23413c545f5e5a769a
Jaewan Kim [Thu, 22 Sep 2016 12:28:57 +0000 (12:28 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13 am:
78fa55e261 am:
b2403f3102 am:
5decf8e715 -s ours
am:
963c269ffa
Change-Id: I709f55ff1694415af29f11694d74c1564dbe36fc
Ajay Panicker [Thu, 22 Sep 2016 12:28:51 +0000 (12:28 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am:
c119a677c4 am:
35d1b45b0f am:
dc0f9fa9c9 -s ours am:
8919cc83bb -s ours am:
0241b6d88a am:
0fee65e58b
am:
08fed21f2c -s ours
Change-Id: I2e790e95077c0760d1be6d984e7e90fb62a3d9db
Ajay Panicker [Thu, 22 Sep 2016 11:58:28 +0000 (11:58 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
786e2694b1 am:
8fd324c33f am:
438cc52ca1 -s ours am:
7f84596929 -s ours am:
ed82c6fac8 am:
c1f8a09c1e am:
8091a00994 -s ours
am:
bc12dda3a7
Change-Id: Ib99bfa28add599f964b1b669de22fd653e42b02a
Ajay Panicker [Thu, 22 Sep 2016 11:23:35 +0000 (11:23 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth" am:
2309b98b25
am:
4a1fd7eb3d
Change-Id: If1fc5aab977c74c0865e0abc18205eaf028148c7
Jaewan Kim [Thu, 22 Sep 2016 11:22:51 +0000 (11:22 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am:
64b7b1522e -s ours am:
5abd69e59a am:
f7f452fd28 am:
8a168a7c5d -s ours am:
298c104ae5 am:
d9e8bfb8cf am:
8cb7a9fdb0
am:
a13096f4c5 -s ours
Change-Id: I5b9a7bb6faae813c9b4f6beeb8f96dfb5ad3cc3b
Jaewan Kim [Thu, 22 Sep 2016 11:21:01 +0000 (11:21 +0000)]
DO NOT MERGE Check caller for sending media key to telephony service am:
d1641e8c27 am:
9477c1674c am:
27d24e01cb -s ours am:
8dffbcd169 -s ours am:
f140f796ea
am:
7eaeeb49bb
Change-Id: I21b359b1471ee527a2bc975c399253def98e40fe
Jaewan Kim [Thu, 22 Sep 2016 10:59:39 +0000 (10:59 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
4e9af38ec4 -s ours am:
031fb04776 am:
2d88f87a82 am:
64110c6bf1 -s ours am:
8d14f464b5 am:
f595add2ff am:
e1e6f0a7f5
am:
9632afe809 -s ours
Change-Id: I68e31867b8c925717eda87a426add614f731f77a
Jaewan Kim [Thu, 22 Sep 2016 10:58:44 +0000 (10:58 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am:
162c80bf0c am:
e47b5adce2 am:
bea0b3ec06 -s ours am:
91ccfa1def am:
4167620d33 am:
2c9ad0ff81
am:
b6d6519e34 -s ours
Change-Id: Idda087e0cbccf3e94dd23a41156cdcc14a4b2459
OSDN Git Service
