OSDN Git Service
Mike Lockwood [Fri, 21 Mar 2014 01:20:40 +0000 (01:20 +0000)]
am
aa7e396f: am
935d417b: am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
aa7e396f44f9b3b12a6abc9d8d62cf3a6f17527b':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Mike Lockwood [Fri, 21 Mar 2014 01:14:12 +0000 (01:14 +0000)]
am
935d417b: am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
935d417b5615a62bc521a8eb58c35de1b4fdf841':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Mike Lockwood [Fri, 21 Mar 2014 01:09:31 +0000 (01:09 +0000)]
am
afc3a5d3: Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
* commit '
afc3a5d386459667f87d764038dd30e3490c64c2':
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
Mike Lockwood [Fri, 21 Mar 2014 01:05:56 +0000 (01:05 +0000)]
Merge "Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"" into klp-dev
Wei Wang [Fri, 21 Mar 2014 00:51:14 +0000 (00:51 +0000)]
am
f479d158: am
bf056846: am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
f479d15814f58ed820829fef0bfadf73cb2b88aa':
Fix stopBatchedScan not working for wifi
Wei Wang [Fri, 21 Mar 2014 00:45:42 +0000 (00:45 +0000)]
am
bf056846: am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
bf0568468da9e02c177abaf9116f9995d53b59aa':
Fix stopBatchedScan not working for wifi
Wei Wang [Fri, 21 Mar 2014 00:41:23 +0000 (00:41 +0000)]
am
058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '
058061da46db0fdac8ea53c463a6b615fde3e928':
Fix stopBatchedScan not working for wifi
Wei Wang [Fri, 21 Mar 2014 00:37:33 +0000 (00:37 +0000)]
Merge "Fix stopBatchedScan not working for wifi" into klp-dev
Adam Powell [Fri, 21 Mar 2014 00:33:06 +0000 (00:33 +0000)]
am
1c84e98f: am
a6454ccb: am
49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit '
1c84e98fc482f75a7ed4373a22096cd447bc55f9':
Update contextual asset bar assets to avoid 9-patch artifacts
Adam Powell [Fri, 21 Mar 2014 00:26:43 +0000 (00:26 +0000)]
am
a6454ccb: am
49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit '
a6454ccbfb5b1f39047f8bac74ec11093469cce2':
Update contextual asset bar assets to avoid 9-patch artifacts
Adam Powell [Fri, 21 Mar 2014 00:22:38 +0000 (00:22 +0000)]
am
49325305: Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
* commit '
49325305905198b9d077ccc784be96e5684e3623':
Update contextual asset bar assets to avoid 9-patch artifacts
Adam Powell [Fri, 21 Mar 2014 00:19:11 +0000 (00:19 +0000)]
Merge "Update contextual asset bar assets to avoid 9-patch artifacts" into klp-dev
Wei Wang [Thu, 20 Mar 2014 23:27:01 +0000 (16:27 -0700)]
Fix stopBatchedScan not working for wifi
Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804
Marco Nelissen [Thu, 20 Mar 2014 20:49:54 +0000 (20:49 +0000)]
am
46b26641: am
7d09713c: am
7cd52895: am
5035faba: (-s ours) am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
46b2664177521a11ee6f4c05a9aee2b516b8f4c3':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:45:32 +0000 (20:45 +0000)]
am
7d09713c: am
7cd52895: am
5035faba: (-s ours) am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
7d09713c5198579c0855089a0a77328d4ec1dc36':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:41:54 +0000 (20:41 +0000)]
am
7cd52895: am
5035faba: (-s ours) am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
7cd52895ec3e014c1097852725ba68646c1d6665':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:36:34 +0000 (20:36 +0000)]
am
5035faba: (-s ours) am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
5035faba9a28f988291c4ff3d3cbf64d828f3f5a':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:22:34 +0000 (13:22 -0700)]
am
cecc6208: am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
cecc62086a6ac7c17ce87d6fab1a4364b8d96cd7':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 20:16:32 +0000 (13:16 -0700)]
am
759445c5: resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
* commit '
759445c5bdb2eb54af9e974f604226596976e078':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 19:51:55 +0000 (12:51 -0700)]
resolved conflicts for merge of
c53ad4cd to jb-mr2-dev
Change-Id: I5fdbc5c8c20386f173efa8957e470a644e6c14ff
Vinit Deshapnde [Thu, 20 Mar 2014 19:42:08 +0000 (19:42 +0000)]
am
b876cae9: am
f92b0072: am
52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit '
b876cae90d8e7e57a685e31cd3b347c325728823':
DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
Vinit Deshapnde [Thu, 20 Mar 2014 19:36:59 +0000 (19:36 +0000)]
am
f92b0072: am
52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit '
f92b00722d84fa0caea25a3363242b6dced0635c':
DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
Mike Lockwood [Wed, 19 Mar 2014 23:56:18 +0000 (16:56 -0700)]
Revert "UsbDeviceManager: Fix race condition between accessory start and USB configured uevents"
This reverts commit
fbd5521fb5e94fad066e21b9f91f4782afe71660.
This change broke support for the 2011 ADK board, which never sends a "set configuration"
command before "accessory start". So we revert this change and will replace it with a better fix.
Bug:
13535051
Bug:
13393825
Change-Id: Icd870d7ff6daff1567e04d93907f70f5d7e37884
Vinit Deshapnde [Thu, 20 Mar 2014 19:31:42 +0000 (19:31 +0000)]
am
52bc363c: Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
* commit '
52bc363cf3a7de8431cfbb370f0fd3adeecaed52':
DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
Vinit Deshapnde [Thu, 20 Mar 2014 19:26:44 +0000 (19:26 +0000)]
Merge "DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns" into klp-dev
Baligh Uddin [Thu, 20 Mar 2014 19:09:09 +0000 (19:09 +0000)]
am
ecf3c574: (-s ours) am
826f3647: (-s ours) am
d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
ecf3c574a8cedd3b104b41623d192d61cb039710':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 19:02:28 +0000 (19:02 +0000)]
am
826f3647: (-s ours) am
d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
826f3647a4a44ffcf154c63fe204a7787b96a657':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 18:37:14 +0000 (18:37 +0000)]
am
d16505da: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
d16505da8676b54dd354da278b1888f28257028b':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 20 Mar 2014 18:32:35 +0000 (18:32 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev
Marco Nelissen [Thu, 20 Mar 2014 18:11:16 +0000 (11:11 -0700)]
am
072e1da2: am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
072e1da26e80adb4009d063428c2ef8fb65c3d6c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 18:06:41 +0000 (11:06 -0700)]
am
b17cf207: am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
b17cf207372268d91177de7efa692b2483785991':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:54:38 +0000 (10:54 -0700)]
am
9ee72b65: am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
9ee72b65436242ab4f8f4ceb904ea5078779416c':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:51:35 +0000 (10:51 -0700)]
am
665b0757: am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
665b07579aa2a74bb5425d543892da40d78b7ef8':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:47:34 +0000 (10:47 -0700)]
am
81fbdade: resolved conflicts for merge of
534f3e94 to jb-mr1-dev
* commit '
81fbdade8db4117157ea48602be121e6cf5597dd':
Verify certificates
Colin Cross [Thu, 20 Mar 2014 17:46:50 +0000 (17:46 +0000)]
am
e4360c8e: am
4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"
* commit '
e4360c8e14d1ea362fb1d13b7a5c9bf003f3be00':
bootanimation: build 32-bit if 64-bit gl libraries are not available
Colin Cross [Thu, 20 Mar 2014 17:33:20 +0000 (10:33 -0700)]
am
4308a523: Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"
* commit '
4308a5230e2887c1ee12e7bdc60e0b93212637ab':
bootanimation: build 32-bit if 64-bit gl libraries are not available
Colin Cross [Thu, 20 Mar 2014 17:28:11 +0000 (17:28 +0000)]
Merge "bootanimation: build 32-bit if 64-bit gl libraries are not available"
Marco Nelissen [Thu, 20 Mar 2014 17:27:58 +0000 (10:27 -0700)]
resolved conflicts for merge of
534f3e94 to jb-mr1-dev
Change-Id: I48ef81bc77d5ececbe9b0cf7d5e905512ca16394
Adam Koch [Thu, 20 Mar 2014 17:05:26 +0000 (17:05 +0000)]
am
8bc12a51: am
5a510a2c: am
6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs
* commit '
8bc12a514918deb5cee9832d9d129c8ed3f7fb4b':
Point bitmaps training class to new samples directory.
Scott Main [Thu, 20 Mar 2014 17:05:23 +0000 (17:05 +0000)]
am
df00735c: am
e02d5a20: am
a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
* commit '
df00735c6791811534d3d2e2790a0dcf7daffcf1':
update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
Wei Wang [Thu, 20 Mar 2014 17:05:20 +0000 (17:05 +0000)]
am
32779536: am
13bd8577: am
c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050 Cherrypick from master to fix b/
13289050
* commit '
32779536bcd66d45019f4ab80dd0d844e618e16b':
DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050 Cherrypick from master to fix b/
13289050
Marco Nelissen [Thu, 20 Mar 2014 17:04:23 +0000 (10:04 -0700)]
am
a3337bc7: Merge "Verify certificates" into jb-dev
* commit '
a3337bc7c3a98ec12b6dec281e26c34f82025bdd':
Verify certificates
Adam Koch [Thu, 20 Mar 2014 16:59:23 +0000 (16:59 +0000)]
am
5a510a2c: am
6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs
* commit '
5a510a2c3e0ec5f2e60577c7a57e60c2101ee354':
Point bitmaps training class to new samples directory.
Scott Main [Thu, 20 Mar 2014 16:59:19 +0000 (16:59 +0000)]
am
e02d5a20: am
a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
* commit '
e02d5a20ede8a6ac46e7b60cc0b258d42e224087':
update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
Wei Wang [Thu, 20 Mar 2014 16:59:13 +0000 (16:59 +0000)]
am
13bd8577: am
c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050 Cherrypick from master to fix b/
13289050
* commit '
13bd85772f6279d14303ec3a18615613c3722844':
DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050 Cherrypick from master to fix b/
13289050
Marco Nelissen [Thu, 20 Mar 2014 16:58:36 +0000 (16:58 +0000)]
Merge "Verify certificates" into jb-dev
Adam Powell [Thu, 20 Mar 2014 00:35:25 +0000 (17:35 -0700)]
Update contextual asset bar assets to avoid 9-patch artifacts
Asset drop from UX
Bug
11879853
Change-Id: I8190340900a16ae41135ec1231e36e959603e165
Wei Wang [Thu, 20 Mar 2014 16:24:09 +0000 (16:24 +0000)]
am
d10bc171: am
15a18d07: am
da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit '
d10bc171a5abb8ddecd8a4888fa8833986f8d8ee':
DO NOT MERGE: Add status callback for start/stop advertising.
Jim Miller [Thu, 20 Mar 2014 16:24:03 +0000 (16:24 +0000)]
am
bd33dc01: am
8e69abf8: am
46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
* commit '
bd33dc01f68ae0f4e4861568c02619e38c40af15':
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
Jim Miller [Thu, 20 Mar 2014 16:24:01 +0000 (16:24 +0000)]
am
e0683de5: am
37050124: am
a413a4ae: Fix the build. DO NOT MERGE
* commit '
e0683de51e56d7a95c88c5c744f45c72a54a95bc':
Fix the build. DO NOT MERGE
Michael Wright [Thu, 20 Mar 2014 16:23:50 +0000 (16:23 +0000)]
am
69e58e44: Merge "Add idc config option for handling key repeats" into klp-modular-dev
* commit '
69e58e446bc2a030ae423d650e60dbfe317331e6':
Add idc config option for handling key repeats
Chris Craik [Thu, 20 Mar 2014 15:47:34 +0000 (15:47 +0000)]
am
29f00c9f: am
7c9bd98a: am
89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev
* commit '
29f00c9f35d8565bb3e6b8a2526cbb237db6446a':
Fix projection offset caching - DO NOT MERGE
Jim Miller [Thu, 20 Mar 2014 15:47:31 +0000 (15:47 +0000)]
am
abde0aaa: am
375ff2c4: am
2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '
abde0aaa7958976b8f3a66e348d6a5152b0d838e':
Attempt to fix a bug where SIM progress dialog gets stuck.
Victoria Lease [Thu, 20 Mar 2014 15:46:18 +0000 (15:46 +0000)]
Narayan Kamath [Thu, 20 Mar 2014 10:18:51 +0000 (10:18 +0000)]
am
c850102d: am
0da4ad42: Merge "Don\'t register methods when there\'s nothing to register."
* commit '
c850102d5c4b1fad47c221911c7be5567cebe8b1':
Don't register methods when there's nothing to register.
Narayan Kamath [Thu, 20 Mar 2014 10:13:27 +0000 (03:13 -0700)]
am
0da4ad42: Merge "Don\'t register methods when there\'s nothing to register."
* commit '
0da4ad425d52d1aeec16b31b784c456753532dc2':
Don't register methods when there's nothing to register.
Narayan Kamath [Thu, 20 Mar 2014 10:08:37 +0000 (10:08 +0000)]
Merge "Don't register methods when there's nothing to register."
Adam Koch [Thu, 20 Mar 2014 09:31:00 +0000 (09:31 +0000)]
am
6398a86f: Merge "Point bitmaps training class to new samples directory." into klp-docs
* commit '
6398a86f1b6ce84effc1417b8b99216e3093af48':
Point bitmaps training class to new samples directory.
Scott Main [Thu, 20 Mar 2014 09:30:51 +0000 (09:30 +0000)]
am
a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
* commit '
a32c43761e5a101efbbb9183f4421ba40f4c75fb':
update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
Adam Koch [Thu, 20 Mar 2014 07:12:06 +0000 (07:12 +0000)]
Merge "Point bitmaps training class to new samples directory." into klp-docs
Adam Koch [Wed, 26 Feb 2014 03:00:20 +0000 (14:00 +1100)]
Point bitmaps training class to new samples directory.
Change-Id: I5c5ca9619fe47c79066db846cbbee1b26d71826e
Scott Main [Wed, 19 Mar 2014 18:51:05 +0000 (11:51 -0700)]
update to wear docs.
includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414
and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad
Change-Id: I035b8db9b266e0af16fe30b3f30846608a3b69a5
Wei Wang [Thu, 20 Mar 2014 03:41:47 +0000 (03:41 +0000)]
am
c0384b6b: DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050 Cherrypick from master to fix b/
13289050
* commit '
c0384b6b18617cc395814c5b20077955a185e392':
DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050 Cherrypick from master to fix b/
13289050
Wei Wang [Thu, 20 Mar 2014 03:36:45 +0000 (03:36 +0000)]
am
15a18d07: am
da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit '
15a18d07acc57d465e9d67bb28010912bb9ad15f':
DO NOT MERGE: Add status callback for start/stop advertising.
Wei Wang [Thu, 20 Mar 2014 03:32:17 +0000 (03:32 +0000)]
am
da084104: Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
* commit '
da084104eb768f4472b7988b77a4f2b7e3f170d8':
DO NOT MERGE: Add status callback for start/stop advertising.
Wei Wang [Wed, 19 Mar 2014 22:47:12 +0000 (15:47 -0700)]
DO NOT MERGE: Move advetise clean up to callback code. fixes b/
13289050
Cherrypick from master to fix b/
13289050
Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
Wei Wang [Thu, 20 Mar 2014 03:27:46 +0000 (03:27 +0000)]
Merge "DO NOT MERGE: Add status callback for start/stop advertising." into klp-dev
Jim Miller [Thu, 20 Mar 2014 02:47:09 +0000 (02:47 +0000)]
am
8e69abf8: am
46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
* commit '
8e69abf8c62452e6e9bcd254a55a2d80c8ef5b3d':
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
Jim Miller [Thu, 20 Mar 2014 02:47:04 +0000 (02:47 +0000)]
am
37050124: am
a413a4ae: Fix the build. DO NOT MERGE
* commit '
370501243685a39a52b6e389b97711b906d2d4f8':
Fix the build. DO NOT MERGE
Chris Craik [Thu, 20 Mar 2014 02:30:15 +0000 (02:30 +0000)]
am
00efaea9: am
dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
* commit '
00efaea980c7a9f84f326b22aef740cb5438d282':
Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
Jim Miller [Thu, 20 Mar 2014 02:30:14 +0000 (02:30 +0000)]
am
46e63117: DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
* commit '
46e631178e3420fee182e7d9d1ddfdbca9355bc1':
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
Chris Craik [Thu, 20 Mar 2014 02:24:53 +0000 (19:24 -0700)]
am
dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
* commit '
dac298005ce3c1361e27bb740e4b518765d43d77':
Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
Jim Miller [Tue, 10 Dec 2013 01:38:05 +0000 (17:38 -0800)]
DO NOT MERGE - Fix memory leak caused by mismatched linkToDeath() in WindowManagerService
This fixes a bug where an allocated DeathRecipient in WindowManagerService
was holding a reference to keyguard binder interface after a call to
linkToDeath() without a matchin unlinkToDeath().
It was causing the keyguard side of the binder interface to stick around,
which in tern prevented the keyguard side from releasing its references.
The solution is to ensure matching linkToDeath()/unlinkToDeath() calls.
Fixes bug
11982048
Change-Id: I6959816b819ba953512c53675162195cbf1e0653
Chris Craik [Thu, 20 Mar 2014 02:19:53 +0000 (02:19 +0000)]
Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON"
Michael Wright [Thu, 20 Mar 2014 01:55:15 +0000 (01:55 +0000)]
Merge "Add idc config option for handling key repeats" into klp-modular-dev
Nick Kralevich [Thu, 20 Mar 2014 01:52:42 +0000 (01:52 +0000)]
am
dd6b7495: am
83725810: Merge "Get rid of noise during boot."
* commit '
dd6b7495577eca7a00aa37bfdca3449cf1443681':
Get rid of noise during boot.
Jim Miller [Thu, 20 Mar 2014 01:49:31 +0000 (01:49 +0000)]
am
a413a4ae: Fix the build. DO NOT MERGE
* commit '
a413a4ae3280be6c45e84e85d7be3379a5cb51e4':
Fix the build. DO NOT MERGE
Nick Kralevich [Thu, 20 Mar 2014 01:47:45 +0000 (18:47 -0700)]
am
83725810: Merge "Get rid of noise during boot."
* commit '
8372581089422364f4f8bc948b9cbdcf5f8c2e91':
Get rid of noise during boot.
Jim Miller [Thu, 20 Mar 2014 01:37:36 +0000 (18:37 -0700)]
Fix the build. DO NOT MERGE
Change-Id: Ic34e351f86cfb8299b666e860c067d905cce6747
Nick Kralevich [Thu, 20 Mar 2014 01:37:38 +0000 (01:37 +0000)]
Merge "Get rid of noise during boot."
Dianne Hackborn [Thu, 20 Mar 2014 00:49:09 +0000 (17:49 -0700)]
Get rid of noise during boot.
This log is not an error, it is a warning, don't spam a stack
crawl when it happens.
Change-Id: I6038e3625cc0c16af9e54887b5e7ec451d9f864d
Colin Cross [Thu, 20 Mar 2014 01:23:28 +0000 (01:23 +0000)]
am
0dccb02b: am
19fc55e1: Merge "build app_process64 on 64-bit targets"
* commit '
0dccb02b9fd714af1db91e4ba3ca0b0da4e563c1':
build app_process64 on 64-bit targets
Colin Cross [Thu, 20 Mar 2014 01:19:25 +0000 (18:19 -0700)]
am
19fc55e1: Merge "build app_process64 on 64-bit targets"
* commit '
19fc55e1e3a51aba4db985d186d1f4ec075d7ca1':
build app_process64 on 64-bit targets
Chris Craik [Thu, 20 Mar 2014 01:14:44 +0000 (01:14 +0000)]
am
7c9bd98a: am
89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev
* commit '
7c9bd98a4bb0aa6954d5f612c197d03f309980f0':
Fix projection offset caching - DO NOT MERGE
Colin Cross [Thu, 20 Mar 2014 01:14:43 +0000 (01:14 +0000)]
Merge "build app_process64 on 64-bit targets"
Jim Miller [Thu, 20 Mar 2014 01:14:40 +0000 (01:14 +0000)]
am
375ff2c4: am
2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '
375ff2c4a7b42d6dfd333e0ffa351be88fdab034':
Attempt to fix a bug where SIM progress dialog gets stuck.
Colin Cross [Thu, 20 Mar 2014 01:09:01 +0000 (18:09 -0700)]
bootanimation: build 32-bit if 64-bit gl libraries are not available
Set LOCAL_32_BIT_ONLY if TARGET_32_BIT_SURFACEFLINGER is set.
Change-Id: I76396cc9fe3fe45d1e98a44bf911d6e70922555a
Chris Craik [Thu, 20 Mar 2014 01:08:45 +0000 (01:08 +0000)]
am
89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev
* commit '
89513ee544cd6373496179758e09954af0ba217d':
Fix projection offset caching - DO NOT MERGE
Jim Miller [Thu, 20 Mar 2014 01:08:43 +0000 (01:08 +0000)]
am
2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
* commit '
2598fbd71a2109ab307d32935a13fa1eab150e8d':
Attempt to fix a bug where SIM progress dialog gets stuck.
Chris Craik [Thu, 20 Mar 2014 01:04:57 +0000 (01:04 +0000)]
Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev
Jim Miller [Thu, 20 Mar 2014 01:04:12 +0000 (01:04 +0000)]
Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev
Colin Cross [Thu, 20 Mar 2014 00:47:39 +0000 (17:47 -0700)]
build app_process64 on 64-bit targets
On 64-bit platforms builds two copies of app_process, the 32-bit
app_process and 64-bit app_process64.
Change-Id: I59d739b5df398ad0bd040c954c57640ff7ab3e72
Wei Wang [Wed, 12 Mar 2014 05:22:41 +0000 (22:22 -0700)]
DO NOT MERGE: Add status callback for start/stop advertising.
Cherrypick from master to fix b/
13289050
Change-Id: I231ba51aaa67b1f917e476ef0f2c8f82c762df77
Conflicts:
core/java/android/bluetooth/BluetoothAdapter.java
core/java/android/bluetooth/BluetoothGatt.java
Victoria Lease [Wed, 19 Mar 2014 22:36:38 +0000 (22:36 +0000)]
Victoria Lease [Wed, 19 Mar 2014 22:32:12 +0000 (22:32 +0000)]
Victoria Lease [Wed, 19 Mar 2014 22:27:06 +0000 (22:27 +0000)]
Victoria Lease [Wed, 19 Mar 2014 22:21:09 +0000 (15:21 -0700)]
Victoria Lease [Wed, 19 Mar 2014 22:14:07 +0000 (15:14 -0700)]
Victoria Lease [Wed, 19 Mar 2014 22:08:32 +0000 (15:08 -0700)]
Vinit Deshapnde [Wed, 19 Mar 2014 22:04:49 +0000 (15:04 -0700)]
DO NOT MERGE - Use Samoa country code to satisfy wifi regulatory concerns
This helps in reducing overt scans when cell network is unavailable; and
in turn helps alleviate some regulatory concerns.
BUG:
11062898
Change-Id: I2d860f2d1acfdafba427504247a54b81482b0f5b
OSDN Git Service
