OSDN Git Service
Tejas Khorana [Mon, 18 Jul 2016 18:18:27 +0000 (11:18 -0700)]
indexOfValue now uses .equals (cont.)
Addresses same issue addressed in SparseArray in LongSparseArray in
the method: indexByValue. Made a new method indexByValueByValue that
compares objects using .equals instead of ==.
Change-Id: I55735fe7ca364d0a9caab2a6909c2eaede845619
Winson [Wed, 29 Jun 2016 02:38:17 +0000 (02:38 +0000)]
Merge \"Move preloading to boot complete. am:
16ef39a7f6 am:
52cfea9c35\" into nyc-mr1-dev-plus-aosp
am:
57b4545f98
Change-Id: I82046b22f1b792d0c04515fc2b2bf315c6b87f9d
Winson [Wed, 29 Jun 2016 02:30:14 +0000 (02:30 +0000)]
Move preloading to boot complete. am:
16ef39a7f6 am:
067d73e55b
am:
93f7f196fc
Change-Id: I0d91cce33589ab55b4f3a334e33367f8878851a6
Android Build Merger (Role) [Wed, 29 Jun 2016 02:26:57 +0000 (02:26 +0000)]
Merge "Move preloading to boot complete. am:
16ef39a7f6 am:
52cfea9c35" into nyc-mr1-dev-plus-aosp
Winson [Wed, 29 Jun 2016 02:26:29 +0000 (02:26 +0000)]
Move preloading to boot complete. am:
16ef39a7f6
am:
52cfea9c35
Change-Id: I08d6ca1d1d26c4792e9973424cb05cf69fcf2871
Winson [Wed, 29 Jun 2016 02:26:28 +0000 (02:26 +0000)]
Move preloading to boot complete. am:
16ef39a7f6
am:
067d73e55b
Change-Id: I03c9bbb8795b6ae43681dfc1787420a1cb997fdd
Winson [Wed, 29 Jun 2016 02:20:47 +0000 (02:20 +0000)]
Move preloading to boot complete.
am:
16ef39a7f6
Change-Id: Ib10db04397d2a962c50530ce537f9ac1b2863a0a
Winson [Wed, 29 Jun 2016 02:20:33 +0000 (02:20 +0000)]
Move preloading to boot complete.
am:
16ef39a7f6
Change-Id: Idaf6c79e076a6b2a1c2d2a2b7282e58bb7c23bce
TreeHugger Robot [Wed, 29 Jun 2016 02:16:10 +0000 (02:16 +0000)]
Merge "Load layout specific breadcrumb view."
Winson [Wed, 29 Jun 2016 01:25:15 +0000 (18:25 -0700)]
Move preloading to boot complete.
Bug:
29320695
Change-Id: I14b5127b218597f3c32e647e0443a88b5a708ce1
Suprabh Shukla [Wed, 29 Jun 2016 01:48:41 +0000 (01:48 +0000)]
Merge changes Id876f01f,If7c94cf8 into nyc-mr1-dev am:
634ed6bc17
am:
a07ed2f383
Change-Id: I795b47e1c7e2c944c0c7525bb108af577546ee53
Suprabh Shukla [Wed, 29 Jun 2016 01:45:17 +0000 (01:45 +0000)]
Merge changes Id876f01f,If7c94cf8 into nyc-mr1-dev
am:
634ed6bc17
Change-Id: Ief5ce9cfa0ec8d221a221ef726e8b516e35db606
Siyamed Sinir [Wed, 29 Jun 2016 01:42:33 +0000 (01:42 +0000)]
Merge "Fix bidi desired width calculation"
Philip P. Moltmann [Wed, 29 Jun 2016 01:38:38 +0000 (01:38 +0000)]
Merge \\"Prevent PrintSpooler from being disabled\\" into nyc-mr1-dev am:
2d8c91f238
am:
463c01b16a
Change-Id: Ie8b7c05ece8c309da47acb988fce149ede972557
TreeHugger Robot [Wed, 29 Jun 2016 01:38:01 +0000 (01:38 +0000)]
Merge changes Id876f01f,If7c94cf8 into nyc-mr1-dev
* changes:
Improving the Reset Demo Warning dialog
Enabling auto-ota in retail demo mode
Philip P. Moltmann [Wed, 29 Jun 2016 01:33:38 +0000 (01:33 +0000)]
Merge \"Prevent PrintSpooler from being disabled\" into nyc-mr1-dev
am:
2d8c91f238
Change-Id: Id3e78a8e097e000cbfae5be1c4991f16d09a0e0e
TreeHugger Robot [Wed, 29 Jun 2016 01:29:39 +0000 (01:29 +0000)]
Merge "Prevent PrintSpooler from being disabled" into nyc-mr1-dev
Chong Zhang [Wed, 29 Jun 2016 01:18:34 +0000 (01:18 +0000)]
Merge \\"Add a few trace points for animation loading.\\" into nyc-mr1-dev am:
8e3b57aad5
am:
e9fdaf5561
Change-Id: I185770c171f6b1c297915b3e97acac332291bc77
Chong Zhang [Wed, 29 Jun 2016 01:13:42 +0000 (01:13 +0000)]
Merge \"Add a few trace points for animation loading.\" into nyc-mr1-dev
am:
8e3b57aad5
Change-Id: I05cd897ef70f7eef70fd3f361ec7564b6e837302
Chong Zhang [Wed, 29 Jun 2016 01:03:26 +0000 (01:03 +0000)]
Merge "Add a few trace points for animation loading." into nyc-mr1-dev
Jim Miller [Wed, 29 Jun 2016 00:56:31 +0000 (00:56 +0000)]
Merge \"Merge \\\"Relax security constraint around getAuthenticatorId().\\\" into nyc-dev am:
60c04126c9 am:
ef26bf0f0a\" into nyc-mr1-dev-plus-aosp
am:
ad2bf7dfc9
Change-Id: I192de1fa8729395fda7e2d5479d3bd2b36bbc440
Jim Miller [Wed, 29 Jun 2016 00:56:23 +0000 (00:56 +0000)]
Merge \\\"Relax security constraint around getAuthenticatorId().\\\" into nyc-dev am:
60c04126c9 am:
3ff70b6370
am:
82100f8e58
Change-Id: I5b47b820eca120ae4a1f9a2cf5440b46237c29c6
Android Build Merger (Role) [Wed, 29 Jun 2016 00:51:13 +0000 (00:51 +0000)]
Merge "Merge \\"Relax security constraint around getAuthenticatorId().\\" into nyc-dev am:
60c04126c9 am:
ef26bf0f0a" into nyc-mr1-dev-plus-aosp
Jim Miller [Wed, 29 Jun 2016 00:50:30 +0000 (00:50 +0000)]
Merge \\"Relax security constraint around getAuthenticatorId().\\" into nyc-dev am:
60c04126c9
am:
3ff70b6370
Change-Id: I36ae63ccfe8032752ed97d7e38fd214604195f10
Jim Miller [Wed, 29 Jun 2016 00:50:30 +0000 (00:50 +0000)]
Merge \\"Relax security constraint around getAuthenticatorId().\\" into nyc-dev am:
60c04126c9
am:
ef26bf0f0a
Change-Id: I219139fde5c35adb09bd1a3f012e97a3a8dc4313
Jim Miller [Wed, 29 Jun 2016 00:45:09 +0000 (00:45 +0000)]
Merge \"Relax security constraint around getAuthenticatorId().\" into nyc-dev
am:
60c04126c9
Change-Id: I367432f84032da91ea5b9a39e8f4cf6a8eb6ea81
Jim Miller [Wed, 29 Jun 2016 00:45:08 +0000 (00:45 +0000)]
Merge \"Relax security constraint around getAuthenticatorId().\" into nyc-dev
am:
60c04126c9
Change-Id: I28a3559159340d663693976cc58dc34f3c730f6c
Steve McKay [Fri, 24 Jun 2016 22:05:08 +0000 (15:05 -0700)]
Load layout specific breadcrumb view.
Because two diffrn't view types can't share an resource id....
else we get ClassCastExceptions bubbling out of Spinner when
tryihng to restore from RecyclerView state.
Also:
Move Bots to own file and make BaseBot inner to that.
Extract searchbot from UiBot.
Fix broken search icon logic in phone layout.
Separate somewhat complicated breadcrumb bot functioanlity in a separate bot.
Simplify Search test.
Check for drawer vs. fixed layout instead of "tablet" mode...which didn't
work when rotating tablets.
Update a dialog entry to use Espresso.
Update breadcrumb stuff to use Espresso.
Move *default state* checking to a different test so we can
enjoy the default location support from ActivityTest.
Change-Id: I0a60ba93a1cbbb990ec3b36d4f9fd5dc8b86ff00
Jim Miller [Wed, 29 Jun 2016 00:37:41 +0000 (00:37 +0000)]
Merge "Relax security constraint around getAuthenticatorId()." into nyc-dev
Hugo Benichi [Wed, 29 Jun 2016 00:30:17 +0000 (00:30 +0000)]
Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev am:
41a3acc55a
am:
ca9a575a79
Change-Id: I948403eb8ff92b2de87d8ce402921b3ede7e0b82
Hugo Benichi [Wed, 29 Jun 2016 00:25:13 +0000 (00:25 +0000)]
Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev
am:
41a3acc55a
Change-Id: I393032c574d5820b37e3a2bbfb412b7bc45d97f2
Hugo Benichi [Wed, 29 Jun 2016 00:15:48 +0000 (00:15 +0000)]
Merge changes I9b4e55c2,I429562a0 into nyc-mr1-dev
* changes:
Add tests for MetricsLoggerService
Tests for IpConnectivityMetricsLog
Ajay Panicker [Tue, 28 Jun 2016 23:53:06 +0000 (23:53 +0000)]
Protect REFRESH_BATCHED_SCAN broadcast am:
58dd0cd65e
am:
925464f986
Change-Id: I4e92385b88d143016cd9b9d9b1243b3fc1367cd1
Suprabh Shukla [Tue, 28 Jun 2016 01:56:23 +0000 (18:56 -0700)]
Improving the Reset Demo Warning dialog
Removing explicit call to setView which was distorting the layout
of a standard AlertDialog. Used the correct unicode characted for
apostrophe. Also removed calls to enable demo mode launcher for user 0.
Bug:
29520255
Change-Id: Id876f01f8e51c02634c03fce1ea93a15b111fc27
Jim Miller [Tue, 28 Jun 2016 23:43:57 +0000 (16:43 -0700)]
Relax security constraint around getAuthenticatorId().
Fixes bug
28603656
Change-Id: I54216d4b9a3ab23f9d5bfe0f40f2dd27e723c21e
Ajay Panicker [Tue, 28 Jun 2016 23:40:15 +0000 (23:40 +0000)]
Protect REFRESH_BATCHED_SCAN broadcast
am:
58dd0cd65e
Change-Id: I3b65f8c81ff6658b593e58ac3897e83146a9d5e0
Philip P. Moltmann [Tue, 28 Jun 2016 21:14:06 +0000 (14:14 -0700)]
Prevent PrintSpooler from being disabled
Change-Id: I40fb7b25174a41d04f767fbf8ee1da8c02e7156a
Fixes:
29830022
Ajay Panicker [Tue, 28 Jun 2016 23:12:37 +0000 (16:12 -0700)]
Protect REFRESH_BATCHED_SCAN broadcast
Bug:
29754520
Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37
Chong Zhang [Tue, 28 Jun 2016 22:25:07 +0000 (15:25 -0700)]
Add a few trace points for animation loading.
Also make sure focusMayChange is set as before commit 8c5d42.
We only want to skip the applyAnimationLocked if animation is
already set, make sure the rest are equivalent.
bug:
29405575
Change-Id: I8342b82d9e6e02fab002e16ffcde4a7479bf6867
Lajos Molnar [Tue, 28 Jun 2016 22:51:07 +0000 (22:51 +0000)]
Merge \\\"media: document VP9 CSD for MediaCodec\\\" into nyc-dev am:
1fe8871f04 am:
a1df385e74
am:
21c8c41f65
Change-Id: I0c49b1f1c6376a9b2a2ea817240bb0a716876e90
Lajos Molnar [Tue, 28 Jun 2016 22:45:04 +0000 (22:45 +0000)]
Merge \\\"media: document VP9 CSD for MediaCodec\\\" into nyc-dev am:
1fe8871f04 am:
818f7c8c1a
am:
cedef1f2fe
Change-Id: I70e1878ae9967e9ae772bcf238d1c19322ffaa32
Lajos Molnar [Tue, 28 Jun 2016 22:41:08 +0000 (22:41 +0000)]
Merge \\"media: document VP9 CSD for MediaCodec\\" into nyc-dev am:
1fe8871f04
am:
a1df385e74
Change-Id: I3abb37c4a03f2e8280f31da6d928047e9c3b1957
Lajos Molnar [Tue, 28 Jun 2016 22:37:37 +0000 (22:37 +0000)]
Merge \\"media: document VP9 CSD for MediaCodec\\" into nyc-dev am:
1fe8871f04
am:
818f7c8c1a
Change-Id: I089bf617d9c86272f7b2c601e372b03846bfa266
Lajos Molnar [Tue, 28 Jun 2016 22:37:34 +0000 (22:37 +0000)]
Merge \"Merge \\\"media: document rotation and scaling issues for MediaCodec\\\" into nyc-dev am:
af9d9f9b3e am:
eb6fac8029\" into nyc-mr1-dev-plus-aosp
am:
9e8a947c34
Change-Id: Iddc0ab85f2ee83d0c1c6cde12d3ce5f557470127
Lajos Molnar [Tue, 28 Jun 2016 22:37:31 +0000 (22:37 +0000)]
Merge \"Merge \\\"media: document format keys for MediaExtractor/CodecCapabilities\\\" into nyc-dev am:
556e012979 am:
ac43565741\" into nyc-mr1-dev-plus-aosp
am:
6294732d65
Change-Id: I0045f0fa609ccf42cfd09adf2c17cee481084645
Lajos Molnar [Tue, 28 Jun 2016 22:37:28 +0000 (22:37 +0000)]
Merge \\\"media: document rotation and scaling issues for MediaCodec\\\" into nyc-dev am:
af9d9f9b3e am:
2d9139410f
am:
3cdb912b8a
Change-Id: Ie16da0d7856495f659f8f90bbf2c490312555e38
Lajos Molnar [Tue, 28 Jun 2016 22:37:25 +0000 (22:37 +0000)]
Merge \\\"media: document format keys for MediaExtractor/CodecCapabilities\\\" into nyc-dev am:
556e012979 am:
29522123db
am:
65e4e1c084
Change-Id: Id977be3b13da8821fce8c5a04d096f604b59df75
Android Build Merger (Role) [Tue, 28 Jun 2016 22:33:23 +0000 (22:33 +0000)]
Merge "Merge \\"media: document rotation and scaling issues for MediaCodec\\" into nyc-dev am:
af9d9f9b3e am:
eb6fac8029" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 28 Jun 2016 22:33:02 +0000 (22:33 +0000)]
Merge "Merge \\"media: document format keys for MediaExtractor/CodecCapabilities\\" into nyc-dev am:
556e012979 am:
ac43565741" into nyc-mr1-dev-plus-aosp
Lajos Molnar [Tue, 28 Jun 2016 22:32:07 +0000 (22:32 +0000)]
Merge \"media: document VP9 CSD for MediaCodec\" into nyc-dev
am:
1fe8871f04
Change-Id: I20c207b5bc735221eaf8982759d00b7a2a89a983
Lajos Molnar [Tue, 28 Jun 2016 22:32:07 +0000 (22:32 +0000)]
Merge \\"media: document rotation and scaling issues for MediaCodec\\" into nyc-dev am:
af9d9f9b3e
am:
eb6fac8029
Change-Id: Id8acd064aa09a84792d2e70448920673e27ddcdc
Lajos Molnar [Tue, 28 Jun 2016 22:32:03 +0000 (22:32 +0000)]
Merge \\"media: document format keys for MediaExtractor/CodecCapabilities\\" into nyc-dev am:
556e012979
am:
ac43565741
Change-Id: Iaab9c87c6f34bdb4677524cd8ccf9e0b00803c66
Lajos Molnar [Tue, 28 Jun 2016 22:32:01 +0000 (22:32 +0000)]
Merge \"media: document VP9 CSD for MediaCodec\" into nyc-dev
am:
1fe8871f04
Change-Id: I5f95ce25ee8099c556f04245291da8345df42584
Lajos Molnar [Tue, 28 Jun 2016 22:31:55 +0000 (22:31 +0000)]
Merge \\"media: document rotation and scaling issues for MediaCodec\\" into nyc-dev am:
af9d9f9b3e
am:
2d9139410f
Change-Id: I7f46ee8cf0cc5c16b235186c30bb72db8005fa6a
Lajos Molnar [Tue, 28 Jun 2016 22:31:52 +0000 (22:31 +0000)]
Merge \\"media: document format keys for MediaExtractor/CodecCapabilities\\" into nyc-dev am:
556e012979
am:
29522123db
Change-Id: I7e062dcc471284c84fe8d186babece0dfb34a0bb
Lajos Molnar [Tue, 28 Jun 2016 22:27:52 +0000 (22:27 +0000)]
Merge "media: document VP9 CSD for MediaCodec" into nyc-dev
Lajos Molnar [Tue, 28 Jun 2016 22:27:05 +0000 (22:27 +0000)]
Merge \"media: document rotation and scaling issues for MediaCodec\" into nyc-dev
am:
af9d9f9b3e
Change-Id: I9a34f84efbc54d49ecc90c1e095be643d26876d3
Lajos Molnar [Tue, 28 Jun 2016 22:26:58 +0000 (22:26 +0000)]
Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev
am:
556e012979
Change-Id: I259b49699bf3e606da8e40aba85288b5a41fe31f
Lajos Molnar [Tue, 28 Jun 2016 22:26:44 +0000 (22:26 +0000)]
Merge \"media: document rotation and scaling issues for MediaCodec\" into nyc-dev
am:
af9d9f9b3e
Change-Id: Ie9d890df1b77c8fd79766e5ea329e5f8db4a94eb
Lajos Molnar [Tue, 28 Jun 2016 22:26:42 +0000 (22:26 +0000)]
Merge \"media: document format keys for MediaExtractor/CodecCapabilities\" into nyc-dev
am:
556e012979
Change-Id: I248fbd3da8dd0376d724ca8aee7f8e71bfb260b0
TreeHugger Robot [Tue, 28 Jun 2016 22:22:20 +0000 (22:22 +0000)]
Merge "sysui: handle single master volume case."
Lajos Molnar [Tue, 28 Jun 2016 22:21:01 +0000 (22:21 +0000)]
Merge "media: document rotation and scaling issues for MediaCodec" into nyc-dev
Lajos Molnar [Tue, 28 Jun 2016 22:19:29 +0000 (22:19 +0000)]
Merge "media: document format keys for MediaExtractor/CodecCapabilities" into nyc-dev
Stan Iliev [Tue, 28 Jun 2016 22:12:30 +0000 (22:12 +0000)]
Merge "Fix wording regarding ThreadedRenderer"
Suprabh Shukla [Mon, 27 Jun 2016 22:12:33 +0000 (15:12 -0700)]
Enabling auto-ota in retail demo mode
Bug:
29542384
Change-Id: If7c94cf8a8e5851011f23dc5d64fc795f9a07b22
Oren Blasberg [Tue, 28 Jun 2016 21:37:04 +0000 (21:37 +0000)]
Merge \\\"Fix popup context menu appearing brokenly.\\\" into nyc-dev am:
29ea814354 am:
b926d0e8ef
am:
7910b5518e
Change-Id: Ia96b93b4e344b9ae4118099943d60cfd43114d0f
Oren Blasberg [Tue, 28 Jun 2016 21:28:43 +0000 (21:28 +0000)]
Merge \\\"Fix popup context menu appearing brokenly.\\\" into nyc-dev am:
29ea814354 am:
9585012ce3
am:
15056b2838
Change-Id: Ie514c22821ef4dc82ea758608172a56f92caf8e7
Oren Blasberg [Tue, 28 Jun 2016 21:28:06 +0000 (21:28 +0000)]
Merge \\"Fix popup context menu appearing brokenly.\\" into nyc-dev am:
29ea814354
am:
b926d0e8ef
Change-Id: I1ea1b512c8518cc7fd7fc00de4a8a6c3157688b0
Oren Blasberg [Tue, 28 Jun 2016 21:24:49 +0000 (21:24 +0000)]
Merge \\"Fix popup context menu appearing brokenly.\\" into nyc-dev am:
29ea814354
am:
9585012ce3
Change-Id: Iaff4d5d9c341f2c14a2c19eaf0675e17ce8d5a0e
Oren Blasberg [Tue, 28 Jun 2016 21:20:02 +0000 (21:20 +0000)]
Merge \"Fix popup context menu appearing brokenly.\" into nyc-dev
am:
29ea814354
Change-Id: I1fdc4c75bf763a3e0c1411230e5a0cdc21ad882a
Oren Blasberg [Tue, 28 Jun 2016 21:19:30 +0000 (21:19 +0000)]
Merge \"Fix popup context menu appearing brokenly.\" into nyc-dev
am:
29ea814354
Change-Id: I722e88756c576acca7419d53738d5883bf864260
Oren Blasberg [Tue, 28 Jun 2016 21:12:26 +0000 (21:12 +0000)]
Merge "Fix popup context menu appearing brokenly." into nyc-dev
Siyamed Sinir [Thu, 19 May 2016 02:57:52 +0000 (19:57 -0700)]
Fix bidi desired width calculation
Layout.getDesiredWidth measured text with TextDirectionHeuristics.LTR,
whereas the real calculations used the active direction heuristic set
in the TextView instance. This CL uses the same heuristics for both of
them by passing the value to Layout.getDesiredWidth function.
Bug:
28845953
Change-Id: I68d23f55fe5a86255d62e83bc62df38a047e4bca
Felipe Leme [Tue, 28 Jun 2016 21:00:04 +0000 (21:00 +0000)]
Merge \"Merge \\\"Remove redundant setPendingIntentWhitelistDuration() calls.\\\" into nyc-dev am:
c1374208e3 am:
2f285643bf\" into nyc-mr1-dev-plus-aosp
am:
97f620db3d
Change-Id: I9e6180d74ec42b7d1286c13e1bfaa07b60bc2a0a
Felipe Leme [Tue, 28 Jun 2016 20:59:55 +0000 (20:59 +0000)]
Merge \\"Merge \\\"Remove redundant setPendingIntentWhitelistDuration() calls.\\\" into nyc-dev am:
c1374208e3\\" into nyc-mr1-dev am:
b1400b142e
am:
62e46e8899
Change-Id: Id8aed75038fed88c8c11a1d953726712b7005c62
Todd Kennedy [Tue, 28 Jun 2016 20:59:47 +0000 (20:59 +0000)]
Merge \\"Define deprecated fields in IntDef\\'s\\" into nyc-mr1-dev am:
23bc74a8d5
am:
c3575b2149
Change-Id: Ic1d2ac7e3cdb06ce1b01661dac1981aafc05b260
Android Build Merger (Role) [Tue, 28 Jun 2016 20:55:45 +0000 (20:55 +0000)]
Merge "Merge \\"Remove redundant setPendingIntentWhitelistDuration() calls.\\" into nyc-dev am:
c1374208e3 am:
2f285643bf" into nyc-mr1-dev-plus-aosp
Felipe Leme [Tue, 28 Jun 2016 20:55:16 +0000 (20:55 +0000)]
Merge \\"Remove redundant setPendingIntentWhitelistDuration() calls.\\" into nyc-dev am:
c1374208e3
am:
2f285643bf
Change-Id: Ibe5b63413e9068ec5de11b78343373d07af77dfa
Felipe Leme [Tue, 28 Jun 2016 20:53:43 +0000 (20:53 +0000)]
Merge \"Merge \\"Remove redundant setPendingIntentWhitelistDuration() calls.\\" into nyc-dev am:
c1374208e3\" into nyc-mr1-dev
am:
b1400b142e
Change-Id: I72cddf720ef8f3efd58ebbe79a2aa3e66a85c95a
Todd Kennedy [Tue, 28 Jun 2016 20:53:40 +0000 (20:53 +0000)]
Merge \"Define deprecated fields in IntDef\'s\" into nyc-mr1-dev
am:
23bc74a8d5
Change-Id: Ic8648d5acff4afdb65074eb9313be082482e2b17
Muyuan Li [Tue, 21 Jun 2016 21:21:48 +0000 (14:21 -0700)]
sysui: handle single master volume case.
Bug:
29446492
Change-Id: Id7414b0cb28d5586f4162850cc67b07c4bee2f6a
(cherry picked from commit
4715f4bb72ed888e392f501a7c1eb8a533e2b33d)
Android Build Merger (Role) [Tue, 28 Jun 2016 20:49:12 +0000 (20:49 +0000)]
Merge "Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev am:
c1374208e3" into nyc-mr1-dev
Felipe Leme [Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)]
Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am:
c1374208e3
Change-Id: Iae3e7fb2ff674046422cc77f10761c8543cd83c5
Felipe Leme [Tue, 28 Jun 2016 20:48:51 +0000 (20:48 +0000)]
Merge \"Remove redundant setPendingIntentWhitelistDuration() calls.\" into nyc-dev
am:
c1374208e3
Change-Id: Ie02a847ac513f89c1c430af0e3f559cf0bc2039d
TreeHugger Robot [Tue, 28 Jun 2016 20:48:36 +0000 (20:48 +0000)]
Merge "Define deprecated fields in IntDef's" into nyc-mr1-dev
TreeHugger Robot [Tue, 28 Jun 2016 20:45:37 +0000 (20:45 +0000)]
Merge "Remove redundant setPendingIntentWhitelistDuration() calls." into nyc-dev
Stan Iliev [Tue, 28 Jun 2016 17:33:15 +0000 (13:33 -0400)]
Fix wording regarding ThreadedRenderer
ThreadedRenderer is not synonymous with hardware rendering, so
remove references to hardware rendering when referring to
ThreadedRenderer.
Change-Id: Ic66a482ccf05f556ebe6ec194ce4f858f75bbb8b
Kirill Grouchnikov [Tue, 28 Jun 2016 20:35:34 +0000 (20:35 +0000)]
Merge "Fix RemoteViews Javadocs for a couple of methods."
Jeff Sharkey [Tue, 28 Jun 2016 20:29:14 +0000 (20:29 +0000)]
Merge \\"Show notification while PRE_BOOT receivers run.\\" into nyc-mr1-dev am:
9d07eed168
am:
59f3efc40d
Change-Id: I5819b07cd2e71d42bc4834950322c01af8149b15
Jeff Sharkey [Tue, 28 Jun 2016 20:24:27 +0000 (20:24 +0000)]
Merge \"Show notification while PRE_BOOT receivers run.\" into nyc-mr1-dev
am:
9d07eed168
Change-Id: I99b62fc38f0f83f78f1f9a1cb627685160b9862f
TreeHugger Robot [Tue, 28 Jun 2016 20:18:58 +0000 (20:18 +0000)]
Merge "Show notification while PRE_BOOT receivers run." into nyc-mr1-dev
Oren Blasberg [Tue, 28 Jun 2016 18:07:42 +0000 (11:07 -0700)]
Fix popup context menu appearing brokenly.
Add missing attribute to the base Theme to ensure the context menu
does not appear completely invisibly.
Bug:
29796385
Change-Id: I4f50579622e97656e09a5ddb6e13313f84efc972
Felipe Leme [Tue, 28 Jun 2016 19:38:05 +0000 (19:38 +0000)]
Merge \\\"Fixed whitelistManager set on unbindServiceLocked()\\\" into nyc-dev am:
8d78c33c9b am:
bdf1c719c9
am:
50f7bb230b
Change-Id: I832ec91bd775adefc4d69ff4bd5106340554be93
Kirill Grouchnikov [Tue, 28 Jun 2016 19:34:13 +0000 (15:34 -0400)]
Fix RemoteViews Javadocs for a couple of methods.
Change-Id: Ie87003bcb0d0c43185e5482e91faee84a798aaee
Felipe Leme [Tue, 28 Jun 2016 19:32:50 +0000 (19:32 +0000)]
Merge \\\"Fixed whitelistManager set on unbindServiceLocked()\\\" into nyc-dev am:
8d78c33c9b am:
ef5c3aad4d
am:
cb9c52fd80
Change-Id: I17e1697ced6f5c44e47f85245b637c82880e27d3
Felipe Leme [Tue, 28 Jun 2016 19:32:36 +0000 (19:32 +0000)]
Merge \\"Fixed whitelistManager set on unbindServiceLocked()\\" into nyc-dev am:
8d78c33c9b
am:
bdf1c719c9
Change-Id: Ic7573a7162299502beae0e1a11e6b41fa9bf4371
Todd Kennedy [Tue, 28 Jun 2016 19:27:36 +0000 (19:27 +0000)]
Merge \"Merge \\\"Default minSdkVersion to \\\'1\\\'\\\" into nyc-dev am:
a98e3e3ede am:
08739a2778\" into nyc-mr1-dev-plus-aosp
am:
68d6fab1ab
Change-Id: I357e4b7bdbd159ffbfaf8c429112db48d9f4d62f
Todd Kennedy [Tue, 28 Jun 2016 19:27:33 +0000 (19:27 +0000)]
Merge \\\"Default minSdkVersion to \\\'1\\\'\\\" into nyc-dev am:
a98e3e3ede am:
a1066ed6c2
am:
e3cc3d8ad4
Change-Id: I42b6c96d661f4f8b3036513303f319c010c00485
Felipe Leme [Tue, 28 Jun 2016 19:27:06 +0000 (19:27 +0000)]
Merge \\"Fixed whitelistManager set on unbindServiceLocked()\\" into nyc-dev am:
8d78c33c9b
am:
ef5c3aad4d
Change-Id: I311e10a4d9406539dfa7c540476b1bf86ebdad8c
Android Build Merger (Role) [Tue, 28 Jun 2016 19:23:13 +0000 (19:23 +0000)]
Merge "Merge \\"Default minSdkVersion to \\'1\\'\\" into nyc-dev am:
a98e3e3ede am:
08739a2778" into nyc-mr1-dev-plus-aosp
OSDN Git Service
