OSDN Git Service
Andreas Huber [Fri, 2 Sep 2016 17:35:06 +0000 (17:35 +0000)]
Initial commit of Java support for hardware binder (DO NOT MERGE) am:
0619b33685 -s ours
am:
bbbe668594
Change-Id: Ibb3190a22ac05057017c6a3f3f0e4f02d0ae4731
Andreas Huber [Fri, 2 Sep 2016 17:24:20 +0000 (17:24 +0000)]
Initial commit of Java support for hardware binder (DO NOT MERGE)
am:
0619b33685 -s ours
Change-Id: I1db7751ebde7b1e24fec86b1fff59c414ea308b3
Roshan Pius [Fri, 2 Sep 2016 07:32:34 +0000 (07:32 +0000)]
Merge commit '
3f3ed24' into stage-aosp-master am:
e9b6029153
am:
756cbb248e
Change-Id: I8d6ad1bcd2c41553ced95c9f59e8a35889d24edf
Roshan Pius [Fri, 2 Sep 2016 07:26:21 +0000 (07:26 +0000)]
Merge commit '
3f3ed24' into stage-aosp-master
am:
e9b6029153
Change-Id: Ife13a5773b542f9af317296addb70d753e64f69b
The Android Automerger [Fri, 2 Sep 2016 07:19:56 +0000 (07:19 +0000)]
Merge commit '
3f3ed24' into stage-aosp-master
Treehugger Robot [Fri, 2 Sep 2016 05:14:41 +0000 (05:14 +0000)]
Merge "NetworkSelectionStatus: Fix copy constructor"
Andreas Huber [Mon, 15 Aug 2016 16:25:02 +0000 (09:25 -0700)]
Initial commit of Java support for hardware binder (DO NOT MERGE)
Change-Id: If1098ab921a11bae8eca2a70a3c3070e4daa0ea2
Roshan Pius [Tue, 30 Aug 2016 16:48:47 +0000 (09:48 -0700)]
NetworkSelectionStatus: Fix copy constructor
Add one more missing element from NetworkSelectionStatus copy constructor.
BUG:
31102798
Change-Id: Iae18f944e7ef722b280b20a51f128f90b2ff45c7
Chih-hung Hsieh [Thu, 1 Sep 2016 17:56:12 +0000 (17:56 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
a6b6252d8b am:
1676161c1d
am:
316fa0aee7
Change-Id: I43d1cc625834092f12adec5ff52d1565d1b91e23
Chih-hung Hsieh [Thu, 1 Sep 2016 17:49:58 +0000 (17:49 +0000)]
Merge "Fix google-explicit-constructor warnings." am:
a6b6252d8b
am:
1676161c1d
Change-Id: Idf7b8caca19d0062955e3423c1420c7247a900bf
Chih-hung Hsieh [Thu, 1 Sep 2016 17:43:58 +0000 (17:43 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
a6b6252d8b
Change-Id: I1d90581b920f0d932795b029b433664f12b0698d
Chih-hung Hsieh [Thu, 1 Sep 2016 17:33:42 +0000 (17:33 +0000)]
Merge "Fix google-explicit-constructor warnings."
Neil Fuller [Thu, 1 Sep 2016 13:34:14 +0000 (13:34 +0000)]
Merge "Track exposure of new j.l.reflect methods" am:
47784a790b am:
e24533d033
am:
328d9f5fc3
Change-Id: Ic6e8a60a33d92dec19947a9a298e26f01482abf0
Neil Fuller [Thu, 1 Sep 2016 13:28:23 +0000 (13:28 +0000)]
Merge "Track exposure of new j.l.reflect methods" am:
47784a790b
am:
e24533d033
Change-Id: I5d2ddd071a79d62cf878b45113a6f7f3c44071aa
Neil Fuller [Thu, 1 Sep 2016 13:23:45 +0000 (13:23 +0000)]
Merge "Track exposure of new j.l.reflect methods"
am:
47784a790b
Change-Id: Id3a391dbc2808925a298f24af942ac927f523bb5
Neil Fuller [Thu, 1 Sep 2016 13:15:52 +0000 (13:15 +0000)]
Merge "Track exposure of new j.l.reflect methods"
Bill Yi [Thu, 1 Sep 2016 07:00:03 +0000 (07:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
ac63c8589c -s ours
am:
fb4699d398 -s ours
Change-Id: I8c6cefce67defe96a9cc97a0f05aaa60ba950093
Bill Yi [Thu, 1 Sep 2016 06:59:55 +0000 (06:59 +0000)]
Import translations. DO NOT MERGE am:
fa6279f670 -s ours
am:
208e9a6fb3 -s ours
Change-Id: I273349ceedd87f8da02c48f42ece459cc0d71822
Bill Yi [Thu, 1 Sep 2016 06:59:45 +0000 (06:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
77f30cd209 -s ours
Change-Id: I9fb4315a0f842493657db51e14bcf5a5554cae0c
Bill Yi [Thu, 1 Sep 2016 06:59:37 +0000 (06:59 +0000)]
Import translations. DO NOT MERGE
am:
4f0e401700 -s ours
Change-Id: I78d7025352a10d338bec46082bcfae2f7e1a29e3
Bill Yi [Thu, 1 Sep 2016 06:59:25 +0000 (06:59 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
a0e5744ded -s ours
Change-Id: Iab9675c2bd812bc19f3dadda1eba881d2c266741
Bill Yi [Thu, 1 Sep 2016 06:59:17 +0000 (06:59 +0000)]
Import translations. DO NOT MERGE
am:
42ba47e66a -s ours
Change-Id: I9e87182158f3fcf45eb3e4ca1ef68476581bdac4
Bill Yi [Thu, 1 Sep 2016 06:51:32 +0000 (06:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
d84995e18f -s ours
am:
782e55f75c -s ours
Change-Id: I4d08dad81f04f32211a4d29df13bcaba8c63a4f8
Bill Yi [Thu, 1 Sep 2016 06:51:29 +0000 (06:51 +0000)]
Import translations. DO NOT MERGE am:
8961beac16 -s ours
am:
fd87141dcf -s ours
Change-Id: I4eca2da033972328374dfbd1a18bf2b16f52a738
Bill Yi [Thu, 1 Sep 2016 06:51:28 +0000 (06:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
ac63c8589c -s ours
Change-Id: I4cd96a7ce626d7106da0e370ad05f9ed4fdfcbbe
Bill Yi [Thu, 1 Sep 2016 06:51:26 +0000 (06:51 +0000)]
Import translations. DO NOT MERGE
am:
fa6279f670 -s ours
Change-Id: Ifcf0616b6e42a1a478dfaa7551c4ba8038396b24
TreeHugger Robot [Thu, 1 Sep 2016 06:46:45 +0000 (06:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 1 Sep 2016 06:46:24 +0000 (06:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 1 Sep 2016 06:44:31 +0000 (06:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 1 Sep 2016 06:43:33 +0000 (06:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
d84995e18f -s ours
Change-Id: Ib01420e8a0b59fe10f75116278ccec8eec99cce3
Bill Yi [Thu, 1 Sep 2016 06:43:29 +0000 (06:43 +0000)]
Import translations. DO NOT MERGE
am:
8961beac16 -s ours
Change-Id: Ic99376ea4d422def6a37a7e334ad4026d3c57db6
TreeHugger Robot [Thu, 1 Sep 2016 06:38:34 +0000 (06:38 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Colin Cross [Thu, 1 Sep 2016 05:52:47 +0000 (05:52 +0000)]
Merge "Fix missing dependency on R.java" am:
227a176508 am:
bfd4422060
am:
0903ecb99b
Change-Id: I2b50adaa9ed052cf3022a78a77729c3b618834f8
Colin Cross [Thu, 1 Sep 2016 05:47:53 +0000 (05:47 +0000)]
Merge "Fix missing dependency on R.java" am:
227a176508
am:
bfd4422060
Change-Id: I2090c1f16e77164d82d4e4f99f478315a81f0fc3
Colin Cross [Thu, 1 Sep 2016 05:40:44 +0000 (05:40 +0000)]
Merge "Fix missing dependency on R.java"
am:
227a176508
Change-Id: Iec4b54a1df71417756459c720a26dd5ea1dc664c
Andrew Solovay [Thu, 1 Sep 2016 05:39:29 +0000 (05:39 +0000)]
docs: Typo fix in multi-window docs am:
0b423e5eae am:
2570531cf4 am:
34f98f7cd9
am:
59fb2fc908
Change-Id: Ifb6e44f926534b78974e39cf7d893ca1034e34fa
Jorim Jaggi [Thu, 1 Sep 2016 05:39:23 +0000 (05:39 +0000)]
Merge "Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations" into nyc-mr1-dev am:
95c1cbeb50
am:
023ea2a3ae
Change-Id: I789ba7621b61d7b28a7f2f838cef26241708c856
Jorim Jaggi [Thu, 1 Sep 2016 05:39:17 +0000 (05:39 +0000)]
Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations am:
435f98de83
am:
d8f89315ac
Change-Id: I192683c1423b792ee324546a602def17de9e101b
Treehugger Robot [Thu, 1 Sep 2016 05:32:48 +0000 (05:32 +0000)]
Merge "Fix missing dependency on R.java"
Andrew Solovay [Thu, 1 Sep 2016 05:30:17 +0000 (05:30 +0000)]
docs: Typo fix in multi-window docs am:
0b423e5eae am:
2570531cf4
am:
34f98f7cd9
Change-Id: I5f25dc04fb82028bded0b60dcd9a2d73ce30c3e2
Jorim Jaggi [Thu, 1 Sep 2016 05:30:14 +0000 (05:30 +0000)]
Merge "Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations" into nyc-mr1-dev
am:
95c1cbeb50
Change-Id: I62796ca217d3dd5fea8ec59ee4a2b57193708c76
Jorim Jaggi [Thu, 1 Sep 2016 05:30:12 +0000 (05:30 +0000)]
Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations
am:
435f98de83
Change-Id: Ib4ba7aa2bc6b7989674b553a03aa4dc2379548a4
Andrew Solovay [Thu, 1 Sep 2016 05:13:32 +0000 (05:13 +0000)]
docs: Typo fix in multi-window docs am:
0b423e5eae
am:
2570531cf4
Change-Id: I7748a6b6361a507e1f5f900c9ea222d3f93ae942
Andrew Solovay [Thu, 1 Sep 2016 04:57:12 +0000 (04:57 +0000)]
docs: Typo fix in multi-window docs
am:
0b423e5eae
Change-Id: I18fe652d972196630006517bacc26b7441efe9ed
Bill Yi [Thu, 1 Sep 2016 04:29:36 +0000 (21:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied5e250ee2377aefe56c6f2282712c28b60104e5
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 1 Sep 2016 04:16:52 +0000 (04:16 +0000)]
Merge "Also show attached windows during FLAG_SHOW_WHEN_LOCKED animations" into nyc-mr1-dev
Andrew Solovay [Thu, 1 Sep 2016 02:48:55 +0000 (02:48 +0000)]
Merge "docs: Fixing formatting problem" into nyc-dev am:
9499478c80 am:
d3f59086a7 am:
59118fc9df
am:
f5e3cc3b85
Change-Id: I703fe1324dae9d401197f1f107b6a95d7c24d51e
Andrew Solovay [Thu, 1 Sep 2016 02:48:46 +0000 (02:48 +0000)]
docs: Fixing formatting problem am:
6f29c2091c am:
28343328c2 am:
dac729b643
am:
6c33d0562a
Change-Id: Ic7a3cc4ebc9dba26a566d41a776ef837447edcbf
Andrew Solovay [Thu, 1 Sep 2016 02:42:08 +0000 (02:42 +0000)]
Merge "docs: Fixing formatting problem" into nyc-dev am:
9499478c80 am:
d3f59086a7
am:
59118fc9df
Change-Id: If2903dd7c1bb63bddd53d1976f817690d59c3aad
Andrew Solovay [Thu, 1 Sep 2016 02:42:06 +0000 (02:42 +0000)]
docs: Fixing formatting problem am:
6f29c2091c am:
28343328c2
am:
dac729b643
Change-Id: Ide7a241012b6f6b321eafa22809d1372f5cfd3f4
Cheryl Potter [Thu, 1 Sep 2016 02:37:46 +0000 (02:37 +0000)]
docs: fixing gpu debugger redirect b/
31227713 am:
780395fd85 am:
72bbe47e9e am:
561c140cc7
am:
10533ccc08
Change-Id: I5ba97719d3f4550aaef3c9e49d2b93b48d2f85b1
Andrew Solovay [Mon, 29 Aug 2016 18:48:50 +0000 (11:48 -0700)]
docs: Typo fix in multi-window docs
Referred to the "android:resizableActivity" property; should
have been "android:resizeableactivity". English prose, however,
consistently uses the (preferred) spelling "resizable".
See first comment for stage location.
bug:
30566808
Change-Id: I2570ff9269b4d2dc8b11f1c98817e50726be78fc
Andrew Solovay [Thu, 1 Sep 2016 02:36:04 +0000 (02:36 +0000)]
Merge "docs: Fixing formatting problem" into nyc-dev am:
9499478c80
am:
d3f59086a7
Change-Id: I9b897a54cf1dfc178f6f10ee34cc253f12b017b0
Andrew Solovay [Thu, 1 Sep 2016 02:36:02 +0000 (02:36 +0000)]
docs: Fixing formatting problem am:
6f29c2091c
am:
28343328c2
Change-Id: Id86e79f3e7654126f59ca87f7fb08aeec3a85324
Andrew Solovay [Thu, 1 Sep 2016 02:26:28 +0000 (02:26 +0000)]
Merge "docs: Fixing formatting problem" into nyc-dev
am:
9499478c80
Change-Id: I893084adf8c6609b451da79ae69c5460619c6f7b
Andrew Solovay [Thu, 1 Sep 2016 02:26:24 +0000 (02:26 +0000)]
docs: Fixing formatting problem
am:
6f29c2091c
Change-Id: I07d721faba05a3eb8b846bea260ee22da08d28e0
Cheryl Potter [Thu, 1 Sep 2016 02:26:18 +0000 (02:26 +0000)]
docs: fixing gpu debugger redirect b/
31227713 am:
780395fd85 am:
72bbe47e9e
am:
561c140cc7
Change-Id: I5c53055e70ec6ed37a677354046860f013a5b73d
Andrew Solovay [Thu, 1 Sep 2016 02:21:46 +0000 (02:21 +0000)]
Merge "docs: Fixing formatting problem" into nyc-dev
Cheryl Potter [Thu, 1 Sep 2016 02:20:01 +0000 (02:20 +0000)]
docs: fixing gpu debugger redirect b/
31227713 am:
780395fd85
am:
72bbe47e9e
Change-Id: Ibb63cad47b7f28f57b37b8226db9ebed85713eaa
Cheryl Potter [Thu, 1 Sep 2016 02:13:34 +0000 (02:13 +0000)]
docs: fixing gpu debugger redirect b/
31227713
am:
780395fd85
Change-Id: Ia285191b97afd5448ed44783d9fbf01c01927744
Bill Yi [Thu, 1 Sep 2016 02:10:31 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id6b5139d8588dc5f871ff4f2e68462e752804341
Auto-generated-cl: translation import
Colin Cross [Thu, 1 Sep 2016 01:01:06 +0000 (18:01 -0700)]
Fix missing dependency on R.java
Compiling frameworks source is missing a dependency on the R.stamp file
generated by the frameworks-res aapt rule, likely caused by the switch
to jack. Use LOCAL_ADDITONAL_DEPENDENCIES to insert the dependency
instead of directly using build system internals.
Change-Id: Ifb830da18b3607f87ae283cea04f7d276d4bfde9
Todd Kennedy [Thu, 1 Sep 2016 00:59:57 +0000 (00:59 +0000)]
Merge "Clear calling identity" into nyc-mr1-dev am:
072abeac57
am:
da285160a0
Change-Id: I3a03613fb395439dc06abfc478ee58f09920b9b0
Todd Kennedy [Thu, 1 Sep 2016 00:56:27 +0000 (00:56 +0000)]
Clear calling identity am:
c25fbdec41
am:
af34fdbee8
Change-Id: I97e5a5905cd3491d38b287d39e864000f9c6d350
Cheryl Potter [Thu, 1 Sep 2016 00:56:23 +0000 (00:56 +0000)]
Merge "docs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more) b/
31158856 b/
31157097 b/
31158502 am:
3f2d7d8e22 am:
8d58464e56" into nyc-mr1-dev am:
d0bc92e435
am:
765761579e
Change-Id: I1324b59261ceb196ead5353a28a6bc43432dfacb
Cheryl Potter [Thu, 1 Sep 2016 00:56:18 +0000 (00:56 +0000)]
docs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more) b/
31158856 b/
31157097 b/
31158502 am:
3f2d7d8e22 am:
8d58464e56 am:
ad03438388
am:
8a1500ded6
Change-Id: I448fd8442f08d5d6a33c703a8cf15ddcf490c38c
Chong Zhang [Thu, 1 Sep 2016 00:56:10 +0000 (00:56 +0000)]
Merge "Do not log surface destroy by default" into nyc-mr1-dev am:
dc02317d92
am:
4800ade070
Change-Id: I9f3b7958a2e8c740a218fdafcafae37cb179ef09
Chong Zhang [Thu, 1 Sep 2016 00:56:05 +0000 (00:56 +0000)]
Do not log surface destroy by default am:
ad23b3fa11
am:
104a58b3c4
Change-Id: I99239c9c3d6f5129dfb5a7254dd594159ea5d700
Todd Kennedy [Thu, 1 Sep 2016 00:46:30 +0000 (00:46 +0000)]
Merge "Clear calling identity" into nyc-mr1-dev
am:
072abeac57
Change-Id: I1250872bec1a71480c464d92960fb92d46c9a13f
Todd Kennedy [Thu, 1 Sep 2016 00:46:24 +0000 (00:46 +0000)]
Clear calling identity
am:
c25fbdec41
Change-Id: Ife652c8496369be624c60f68a3b3fa2bdd112fe7
Cheryl Potter [Thu, 1 Sep 2016 00:46:17 +0000 (00:46 +0000)]
Merge "docs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more) b/
31158856 b/
31157097 b/
31158502 am:
3f2d7d8e22 am:
8d58464e56" into nyc-mr1-dev
am:
d0bc92e435
Change-Id: I827f54b578443b9584f08f4653963207dc21cfb9
Cheryl Potter [Thu, 1 Sep 2016 00:46:11 +0000 (00:46 +0000)]
docs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more) b/
31158856 b/
31157097 b/
31158502 am:
3f2d7d8e22 am:
8d58464e56
am:
ad03438388
Change-Id: Ibe7983eef076550f4875dfaf03876f4555456eb1
Chong Zhang [Thu, 1 Sep 2016 00:46:00 +0000 (00:46 +0000)]
Merge "Do not log surface destroy by default" into nyc-mr1-dev
am:
dc02317d92
Change-Id: I5ad4e2a8f96e32a79eb95603ad9dba3d672feb62
Chong Zhang [Thu, 1 Sep 2016 00:45:58 +0000 (00:45 +0000)]
Do not log surface destroy by default
am:
ad23b3fa11
Change-Id: I91303c5855ac0733a1de0c303236070d87089b85
Cheryl Potter [Thu, 1 Sep 2016 00:43:37 +0000 (17:43 -0700)]
docs: fixing gpu debugger redirect
b/
31227713
Change-Id: Ia0e7e4d26940dc98ab735df3068dc2dda22b1f58
TreeHugger Robot [Thu, 1 Sep 2016 00:41:47 +0000 (00:41 +0000)]
Merge "Clear calling identity" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 1 Sep 2016 00:39:40 +0000 (00:39 +0000)]
Merge "docs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more) b/
31158856 b/
31157097 b/
31158502 am:
3f2d7d8e22 am:
8d58464e56" into nyc-mr1-dev
TreeHugger Robot [Thu, 1 Sep 2016 00:39:34 +0000 (00:39 +0000)]
Merge "Do not log surface destroy by default" into nyc-mr1-dev
Cheryl Potter [Thu, 1 Sep 2016 00:39:14 +0000 (00:39 +0000)]
docs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more) b/
31158856 b/
31157097 b/
31158502 am:
3f2d7d8e22
am:
8d58464e56
Change-Id: Ibafd847b03f44befdef59e7d3f578fc07b9f4265
Cheryl Potter [Thu, 1 Sep 2016 00:30:55 +0000 (00:30 +0000)]
docs: Add redirects for new help buttons (Create Java Class, GPU Debugger, more) b/
31158856 b/
31157097 b/
31158502
am:
3f2d7d8e22
Change-Id: I06fc6611cf1a802e4971385d6b105a223b6c9301
Pablo Ceballos [Thu, 1 Sep 2016 00:23:24 +0000 (00:23 +0000)]
Merge "Handle null Surface in createVirtualDisplay" into nyc-mr1-dev am:
9103680158
am:
e584593641
Change-Id: I6f36890fc8cb7ae5f1839199279fd76158c75c3e
Pablo Ceballos [Thu, 1 Sep 2016 00:23:21 +0000 (00:23 +0000)]
Handle null Surface in createVirtualDisplay am:
eb3370d490
am:
b7d3f5b63b
Change-Id: I2c94542234bed20440dc5b927e1f27de47cf44d5
Pablo Ceballos [Thu, 1 Sep 2016 00:16:46 +0000 (00:16 +0000)]
Merge "Handle null Surface in createVirtualDisplay" into nyc-mr1-dev
am:
9103680158
Change-Id: Ife70ed600ed008839af4ff024afa26920817d6a7
Pablo Ceballos [Thu, 1 Sep 2016 00:16:42 +0000 (00:16 +0000)]
Handle null Surface in createVirtualDisplay
am:
eb3370d490
Change-Id: I8af2a4356c2ea857affb047c946a5656f6c144f6
Pablo Ceballos [Thu, 1 Sep 2016 00:06:30 +0000 (00:06 +0000)]
Merge "Handle null Surface in createVirtualDisplay" into nyc-mr1-dev
Sudheer Shanka [Wed, 31 Aug 2016 23:50:28 +0000 (23:50 +0000)]
Merge "Allow package verifier and uninstaller to do silent uninstalls." into nyc-mr1-dev am:
0b69970e36
am:
608d4d8a46
Change-Id: I6f4bca57fe879f69626ca2b16d63ea2d7f20f295
Sudheer Shanka [Wed, 31 Aug 2016 23:47:46 +0000 (23:47 +0000)]
Allow package verifier and uninstaller to do silent uninstalls. am:
bf6154a5ba
am:
51b6b7d507
Change-Id: I4443dcf82d9a40d0051618b65175018489e1dba2
Jeff Sharkey [Wed, 31 Aug 2016 23:47:42 +0000 (23:47 +0000)]
Merge "DO NOT MERGE. Block adoptable storage when using FBE." into nyc-mr1-dev am:
c081d2b870
am:
8215d988eb
Change-Id: Ia55bb188f420fca11dadcc940505d297a0a5f16d
Jeff Sharkey [Wed, 31 Aug 2016 23:47:39 +0000 (23:47 +0000)]
DO NOT MERGE. Block adoptable storage when using FBE. am:
6ed7418228
am:
b1123e7871
Change-Id: Ie1d13350e15e3bf5bb41d16b6960b55ebb8d966b
Jeff Sharkey [Wed, 31 Aug 2016 23:47:35 +0000 (23:47 +0000)]
Merge "DO NOT MERGE. Update lockscreen message when user unlocked." into nyc-mr1-dev am:
26887dc880
am:
444af99af6
Change-Id: Ie3a8bfbcb88190aba2402a43e86bafafcc51aae1
Jeff Sharkey [Wed, 31 Aug 2016 23:47:31 +0000 (23:47 +0000)]
DO NOT MERGE. Update lockscreen message when user unlocked. am:
99e1bca91a
am:
be4949f489
Change-Id: Ic44fb8c9ce8462e24891c72ddbb265f494b6d4f1
Sudheer Shanka [Wed, 31 Aug 2016 23:30:15 +0000 (23:30 +0000)]
Merge "Allow package verifier and uninstaller to do silent uninstalls." into nyc-mr1-dev
am:
0b69970e36
Change-Id: Id271199ce9e7e690bed052dcb4c804a185827544
Sudheer Shanka [Wed, 31 Aug 2016 23:30:12 +0000 (23:30 +0000)]
Allow package verifier and uninstaller to do silent uninstalls.
am:
bf6154a5ba
Change-Id: Iab55e58e02a2088c541406bc0b71aa14df7b028e
Jeff Sharkey [Wed, 31 Aug 2016 23:30:08 +0000 (23:30 +0000)]
Merge "DO NOT MERGE. Block adoptable storage when using FBE." into nyc-mr1-dev
am:
c081d2b870
Change-Id: Ibce0c8e82d31b7eea405bc72d486d25a3051f08e
Jeff Sharkey [Wed, 31 Aug 2016 23:30:05 +0000 (23:30 +0000)]
DO NOT MERGE. Block adoptable storage when using FBE.
am:
6ed7418228
Change-Id: I3880da0330ea3acc62655878df4876495e24a2a3
Jeff Sharkey [Wed, 31 Aug 2016 23:30:00 +0000 (23:30 +0000)]
Merge "DO NOT MERGE. Update lockscreen message when user unlocked." into nyc-mr1-dev
am:
26887dc880
Change-Id: If086b75dd28b0838cd576469eb4ad05deea01d50
Jeff Sharkey [Wed, 31 Aug 2016 23:29:54 +0000 (23:29 +0000)]
DO NOT MERGE. Update lockscreen message when user unlocked.
am:
99e1bca91a
Change-Id: I578646f2ff948c0180eee1b815aa0edbfa5fb187
Jeff Sharkey [Wed, 31 Aug 2016 23:29:29 +0000 (23:29 +0000)]
Merge "DO NOT MERGE. Clarify FileObserver docs for null value." into nyc-mr1-dev am:
cdd2b6f311
am:
50e3aa4181
Change-Id: Ib6de25647526a0a734b7c012ec82c5a3ff82ff11
Jeff Sharkey [Wed, 31 Aug 2016 23:29:26 +0000 (23:29 +0000)]
DO NOT MERGE. Clarify FileObserver docs for null value. am:
c041f5a3b8
am:
a341d70602
Change-Id: Ib737218df19aed7f09ba142cce4fc9c62edffd5d
Todd Kennedy [Wed, 31 Aug 2016 23:29:20 +0000 (23:29 +0000)]
Merge "throw if >1 verifier found" into nyc-mr1-dev am:
a1ce6ee444
am:
2ebbd82c5a
Change-Id: I733ab1dcc2d55faebce8445f2aa5ebaa710d8c5a
OSDN Git Service
